summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock62
-rw-r--r--flake.nix4
-rw-r--r--home/apps/caelestia/settings.nix63
3 files changed, 84 insertions, 45 deletions
diff --git a/flake.lock b/flake.lock
index c2c66ea..d1a4883 100644
--- a/flake.lock
+++ b/flake.lock
@@ -116,11 +116,11 @@
]
},
"locked": {
- "lastModified": 1768006439,
- "narHash": "sha256-OpCihP2RndUI20xzBgysN8kOjl4bzN/GMsbn3c3FJx4=",
+ "lastModified": 1768085951,
+ "narHash": "sha256-8vITVtfLvl99AR5q2UWK5hUVb6N2UZ/9ccMDlzowIXw=",
"ref": "refs/heads/main",
- "rev": "9c6aea03b58ead9044184724613ea1baa2a3cd35",
- "revCount": 1728,
+ "rev": "284a4f8cc8657385152c3e58eb6665e066760468",
+ "revCount": 1730,
"type": "git",
"url": "https://g.freya.cat/caelestia-shell"
},
@@ -258,11 +258,11 @@
]
},
"locked": {
- "lastModified": 1767619743,
- "narHash": "sha256-N0kK1JqxIjFl7hPAfhkW6C9AO7feYJUWLPyqJO2VuQQ=",
+ "lastModified": 1767971841,
+ "narHash": "sha256-TwDXF4MkmjI9c3Sly9FOWXf4sPbre6ZujG87v39G1Ig=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "a65c04965c841eb01ba401f5162f12bc8d52014f",
+ "rev": "0e4217b2c4827e71e2e612accccb01981c16afda",
"type": "github"
},
"original": {
@@ -279,16 +279,16 @@
]
},
"locked": {
- "lastModified": 1766381032,
- "narHash": "sha256-Wuk2MULnGfgAbP1N/Rp6H6k7zG/ynDiy54mPvkt/4bM=",
+ "lastModified": 1767957561,
+ "narHash": "sha256-N0kFdc6tSE0yFeQ/Iit3KNrz4nf2K5xvP3juL7SUyhc=",
"owner": "outfoxxed",
"repo": "hy3",
- "rev": "50643d625829f303239f9ec019021f17d7e9f3fc",
+ "rev": "3287049e79e9e51431de8c09f9192a18afa1bf35",
"type": "github"
},
"original": {
"owner": "outfoxxed",
- "ref": "master",
+ "ref": "hl0.53.0",
"repo": "hy3",
"type": "github"
}
@@ -370,16 +370,16 @@
"xdph": "xdph"
},
"locked": {
- "lastModified": 1767021696,
- "narHash": "sha256-q365S7ePBQStSDPEzssCU14TzRqdKzEdh0+0rR2KDnU=",
+ "lastModified": 1767388857,
+ "narHash": "sha256-h70Tlpce8NEkwWqw/DDpeOKPzPyfq7P2t0HtGM5Z3Cw=",
"owner": "hyprwm",
"repo": "Hyprland",
- "rev": "ea444c35bb23b6e34505ab6753e069de7801cc25",
+ "rev": "ab1d80f3d6aebd57a0971b53a1993b1c1dfe0b09",
"type": "github"
},
"original": {
"owner": "hyprwm",
- "ref": "v0.53.0",
+ "ref": "v0.53.1",
"repo": "Hyprland",
"type": "github"
}
@@ -655,11 +655,11 @@
]
},
"locked": {
- "lastModified": 1767570455,
- "narHash": "sha256-Yw2sx8d41ef79QWvdYP4i4fGNflTlE2zKXSah+AiKIQ=",
+ "lastModified": 1767736040,
+ "narHash": "sha256-DMte6hl0SQ/LhSIO578G8iK4RSnrxJAIJoE93sJOtS8=",
"owner": "cynicsketch",
"repo": "nix-mineral",
- "rev": "22ea24a2b82729c118c2235f068d12151aaf5387",
+ "rev": "39e3f2a8b58cde9e753be800d6c7b6050e84f81e",
"type": "github"
},
"original": {
@@ -707,11 +707,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1767379071,
- "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
+ "lastModified": 1767892417,
+ "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
+ "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
"type": "github"
},
"original": {
@@ -799,11 +799,11 @@
]
},
"locked": {
- "lastModified": 1767949765,
- "narHash": "sha256-sb9X1evrQI2+4qmYCCAHMSiJFqj4eAuZp5BwYrOiJmA=",
+ "lastModified": 1768080170,
+ "narHash": "sha256-HYKRNShQe5YnnxLazQajB9JkAPGpVcUt9jQ3KwilITQ=",
"ref": "refs/heads/master",
- "rev": "eecc2f88b3b12a672df79e74f2bd49ef65f0abdf",
- "revCount": 721,
+ "rev": "bcc3d4265e8b3ed2b17b801923905b60a3927823",
+ "revCount": 722,
"type": "git",
"url": "https://git.outfoxxed.me/outfoxxed/quickshell"
},
@@ -949,11 +949,11 @@
]
},
"locked": {
- "lastModified": 1767499857,
- "narHash": "sha256-0zUU/PW09d6oBaR8x8vMHcAhg1MOvo3CwoXgHijzzNE=",
+ "lastModified": 1767826491,
+ "narHash": "sha256-WSBENPotD2MIhZwolL6GC9npqgaS5fkM7j07V2i/Ur8=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "ecc41505948ec2ab0325f14c9862a4329c2b4190",
+ "rev": "ea3adcb6d2a000d9a69d0e23cad1f2cacb3a9fbe",
"type": "github"
},
"original": {
@@ -1112,11 +1112,11 @@
]
},
"locked": {
- "lastModified": 1767568852,
- "narHash": "sha256-6s8hL3YX9zAq2T7qvcwwzaEVwc9MEYbW+C2LcAAQfbk=",
+ "lastModified": 1767763594,
+ "narHash": "sha256-5ysv8EuVAgDoYmNuXEUNf7vBzdeRaFxeIlIndv5HMvs=",
"owner": "0xc000022070",
"repo": "zen-browser-flake",
- "rev": "350c729b261e6f5529460140a5f0943dd4c5e156",
+ "rev": "8b2302d8c10369c9135552cc892da75cff5ddb03",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 8540ea9..9e68b44 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,13 +8,13 @@
home-manager.url = "github:nix-community/home-manager/master";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
# hyprland
- hyprland.url = "github:hyprwm/Hyprland/v0.53.0";
+ hyprland.url = "github:hyprwm/Hyprland/v0.53.1";
hyprland.inputs.nixpkgs.follows = "nixpkgs";
# hyprland plugins
hyprland-plugins.url = "github:hyprwm/hyprland-plugins/v0.53.0";
hyprland-plugins.inputs.hyprland.follows = "hyprland";
# hyprland hy3
- hy3.url = "github:outfoxxed/hy3/master";
+ hy3.url = "github:outfoxxed/hy3/hl0.53.0";
hy3.inputs.hyprland.follows = "hyprland";
# sops
sops-nix.url = "github:Mic92/sops-nix";
diff --git a/home/apps/caelestia/settings.nix b/home/apps/caelestia/settings.nix
index 35ecf9b..b30dfa6 100644
--- a/home/apps/caelestia/settings.nix
+++ b/home/apps/caelestia/settings.nix
@@ -2,7 +2,54 @@
programs.caelestia = {
settings = {
# Look
- appearance = {
+ appearance = rec {
+ # Rounding
+ rounding = let
+ inner = config.theme.innerRadius;
+ outer = config.theme.outerRadius;
+ in {
+ small = inner;
+ normal = outer;
+ large = outer + outer;
+ full = 1000;
+ };
+
+ # Spacing
+ spacing = let
+ diff = 5;
+ in {
+ small = padding.small + diff;
+ smaller = padding.smaller + diff;
+ normal = padding.normal + diff;
+ larger = padding.larger + diff;
+ large = padding.large + diff;
+ };
+
+ # Padding
+ padding = let
+ inner = config.theme.innerGap;
+ outer = config.theme.outerGap;
+ avg = builtins.div (outer + inner) 2;
+ in {
+ small = inner;
+ smaller = avg;
+ normal = outer;
+ larger = outer + inner;
+ large = outer + avg;
+ };
+
+ # Fontsize
+ font.size = let
+ base = config.theme.font.size;
+ in {
+ small = base - 2;
+ smaller = base - 1;
+ normal = base;
+ larger = base + 2;
+ large = base + 5;
+ extraLarge = base + 15;
+ };
+
# Animations
anim = {
durations = {
@@ -10,15 +57,7 @@
};
};
- # Font
- font = {
- size.scale = 1;
- };
-
- # Padding
- padding.scale = 1;
- rounding.scale = 1;
- spacing.scale = 1;
+ # Transparency
transparency = {
enabled = true;
base = config.theme.opacity;
@@ -128,8 +167,8 @@
activeLabel = "";
};
border = {
- rounding = 25;
- thickness = 10;
+ rounding = config.theme.outerRadius;
+ thickness = config.theme.outerGap;
};
dashboard = {
enabled = true;