update shell and shell themeHEADmain

1 files changed, 51 insertions, 12 deletions

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;