summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock16
-rw-r--r--home/apps/caelestia/settings.nix63
2 files changed, 59 insertions, 20 deletions
diff --git a/flake.lock b/flake.lock
index d3941ab..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"
},
@@ -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"
},
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;