3 files changed, 57 insertions, 47 deletions
diff --git a/home/modules/profiles/base/config/foot.nix b/home/modules/profiles/base/config/foot.nix
index d53dba7..c47f689 100644
--- a/home/modules/profiles/base/config/foot.nix
+++ b/home/modules/profiles/base/config/foot.nix
@@ -1,3 +1,7 @@
+{ neotheme }:
+
+with neotheme.palette.colors;
+
 {
   main = {
     term = "foot";
@@ -11,23 +15,23 @@
   cursor.style = "beam";
 
   colors = {
-    background = "18191f";
-    foreground = "cbc0ab";
-    regular0 = "222329";
-    regular1 = "b17f81";
-    regular2 = "8aa387";
-    regular3 = "d4ae80";
-    regular4 = "8896ae";
-    regular5 = "c495a2";
-    regular6 = "7aacaa";
-    regular7 = "d0d0c7";
-    bright0 = "36373d";
-    bright1 = "c59395";
-    bright2 = "9eb79b";
-    bright3 = "e8c294";
-    bright4 = "9caac2";
-    bright5 = "d8a9b6";
-    bright6 = "8ec0be";
-    bright7 = "e4e4db";
+    background = background;
+    foreground = foreground;
+    regular0 = color0;
+    regular1 = color1;
+    regular2 = color2;
+    regular3 = color3;
+    regular4 = color4;
+    regular5 = color5;
+    regular6 = color6;
+    regular7 = color7;
+    bright0 = bright0;
+    bright1 = bright1;
+    bright2 = bright2;
+    bright3 = bright3;
+    bright4 = bright4;
+    bright5 = bright5;
+    bright6 = bright6;
+    bright7 = bright7;
   };
-}
\ No newline at end of file
+}
diff --git a/home/modules/profiles/base/config/sway.nix b/home/modules/profiles/base/config/sway.nix
index ead4bfe..f294af5 100644
--- a/home/modules/profiles/base/config/sway.nix
+++ b/home/modules/profiles/base/config/sway.nix
@@ -1,4 +1,6 @@
-{ pkgs, wallpapers }:
+{ pkgs, neotheme }:
+
+with neotheme.palette.colors;
 
 ''
   exec autotiling
@@ -157,22 +159,22 @@
   gaps inner 8
   smart_borders on
 
-  set $color0 #18191f
-  set $color1 #e27878
-  set $color2 #b4be82
-  set $color3 #e2a478
-  set $color4 #84a0c6
-  set $color5 #a093c7
-  set $color6 #89b8c2
-  set $color7 #c6c8d1
-  set $color8 #3c3d43
-  set $color9 #e98989
-  set $color10 #c0ca8e
-  set $color11 #e9b189
-  set $color12 #91acd1
-  set $color13 #ada0d3
-  set $color14 #95c4ce
-  set $color15 #d2d4de
+  set $color0 #${color0}
+  set $color1 #${color1}
+  set $color2 #${color2}
+  set $color3 #${color3}
+  set $color4 #${color4}
+  set $color5 #${color5}
+  set $color6 #${color6}
+  set $color7 #${color7}
+  set $color8 #${bright0}
+  set $color9 #${bright1}
+  set $color10 #${bright2}
+  set $color11 #${bright3}
+  set $color12 #${bright4}
+  set $color13 #${bright5}
+  set $color14 #${bright6}
+  set $color15 #${bright7}
 
   set $primary $color4
   set $muted #4d698f
@@ -182,7 +184,7 @@
   client.focused_inactive $muted $muted $color0 $color5
   client.unfocused        $muted $muted $color7 $color5
   client.urgent           $color10 $color10 $color0 $color5
-  output "*" bg ${wallpapers}/nixos/nix-glow-fg-d4ae80.png fill
+  output "*" bg ${neotheme.wallpaper} fill
   output "*" scale 1
   output "*" scale_filter nearest
   
diff --git a/home/modules/profiles/base/config/waybar-style.nix b/home/modules/profiles/base/config/waybar-style.nix
index ccb88b2..c47ea23 100644
--- a/home/modules/profiles/base/config/waybar-style.nix
+++ b/home/modules/profiles/base/config/waybar-style.nix
@@ -1,3 +1,7 @@
+{ neotheme }:
+
+with neotheme.palette.colors;
+
 ''
   * {
     border: none;
@@ -8,20 +12,20 @@
   }
 
   window#waybar {
-    background: #18191f;
-    color: #84a0c6;
+    background: #${background};
+    color: #${foreground};
   }
 
   #workspaces button {
     padding: 0 8px;
-    background: #84a0c6;
-    color: #18191f;
+    background: #${color4};
+    color: #${background};
     border-bottom: 3px solid rgba (255, 255, 255, .2);
   }
 
   #workspaces button.focused {
-    background-color: #84a0c6;
-    border-bottom: 3px solid #18191f;
+    background-color: #${color4};
+    border-bottom: 3px solid #${background};
   }
 
   #workspaces button:hover {
@@ -43,15 +47,15 @@
   #custom-weather {
     padding: 0 10px;
     margin: 0 4px;
-    color: #18191f;
-    background-color: #84a0c6;
+    color: #${background};
+    background-color: #${color4};
     border-bottom: 3px solid rgba (255, 255, 255, .2);
   }
 
   @keyframes blink {
     to {
-      background-color: #84a0c6;
-      color: #18191f;
+      background-color: #${color4};
+      color: #${background};
     }
   }
 ''