6 files changed, 97 insertions, 42 deletions

diff --git a/modules/user/desktop/components/waybar/default.nix b/modules/user/desktop/components/waybar/default.nix
index 02747c4..0fa0f16 100644
--- a/modules/user/desktop/components/waybar/default.nix
+++ b/modules/user/desktop/components/waybar/default.nix
@@ -21,8 +21,6 @@
           "battery"
           "network"
           "wireplumber"
-          "cpu"
-          "memory"
         ];
 
         backlight = {
@@ -56,7 +54,6 @@
           tooltip-format-critical = "plug yo shit in NOW!!";
         };
 
-        cpu.format = "{avg_frequency} GHz";
         clock = {
           format = "{:%A, %b %d %Y - %H:%M %Z}";
           # i am the time god. fear me.
@@ -76,16 +73,6 @@
           tooltip-format = "{tz_list}";
         };
 
-        memory = {
-          format = "{used}/{total} GiB";
-          states = {
-            critical = 90;
-            warning = 70;
-          };
-
-          tooltip-format = "{percentage}% used";
-        };
-
         network = {
           format-disabled = "󰀝";
           format-disconnected = "󰌙";
diff --git a/modules/user/desktop/components/waybar/style-blue.css b/modules/user/desktop/components/waybar/style-blue.css
index b00c4b3..9df1136 100644
--- a/modules/user/desktop/components/waybar/style-blue.css
+++ b/modules/user/desktop/components/waybar/style-blue.css
@@ -6,44 +6,44 @@
 }
 
 window#waybar {
-    background: none;
-    color: #e0def4;
+    background: #11111b;
+    color: #cdd6f4;
 }
 
 tooltip {
-    background: rgba(38, 35, 58, 0.8);
-    border-radius: 10px;
+    background: #1e1e2e;
+    border: 2px solid #89b4fa;
 }
 
 tooltip label {
-    color: #e0def4;
+    color: #cdd6f4;
 }
 
 #workspaces button {
     background: none;
     box-shadow: none;
-    color: #6e6a86;
+    color: #585b70;
     padding: 0;
 }
 
 #workspaces button.empty {
-    color: #403d52;
+    color: #313244;
 }
 
 #workspaces button.visible {
-    color: #908caa;
+    color: #6c7086;
 }
 
 #workspaces button.focused {
-    color: #ebbcba;
+    color: #89b4fa;
 }
 
 #workspaces button.urgent {
-    color: #eb6f92;
+    color: #f38ba8;
 }
 
 #workspaces button:hover {
-    color: #e0def4;
+    color: #cdd6f4;
     text-shadow: inherit;
 }
 
@@ -52,12 +52,6 @@ tooltip label {
     padding-top: 2px;
 }
 
-.modules-left, .modules-center, .modules-right {
-    background: rgba(25, 23, 36, 0.8);
-    border-top-left-radius: 10px;
-    border-top-right-radius: 10px;
-}
-
 .modules-left {
     margin-left: 8px;
     margin-right: 4px;
@@ -70,12 +64,12 @@ tooltip label {
 
 @keyframes blink {
     to {
-        color: #e0def4;
+        color: #cdd6f4;
     }
 }
 
 #battery.charging {
-    color: #9ccfd8;
+    color: #a6e3a1;
 }
 
 #battery.critical:not(.charging) {
@@ -84,13 +78,5 @@ tooltip label {
     animation-iteration-count: infinite;
     animation-name: blink;
     animation-timing-function: steps(2);
-    color: #eb6f92;
-}
-
-#cpu {
-    box-shadow: inset 0 -2px #ebbcba;
-}
-
-#memory {
-    box-shadow: inset 0 -2px #f6c177;
+    color: #f38ba8;
 }
diff --git a/modules/user/desktop/components/waybar/style-pink.css b/modules/user/desktop/components/waybar/style-pink.css
new file mode 100644
index 0000000..491279a
--- /dev/null
+++ b/modules/user/desktop/components/waybar/style-pink.css
@@ -0,0 +1,82 @@
+* {
+    border: none;
+    border-radius: 0;
+    font-family: 'FiraCode Nerd Font Mono';
+    min-height: 0;
+}
+
+window#waybar {
+    background: #11111b;
+    color: #cdd6f4;
+}
+
+tooltip {
+    background: #1e1e2e;
+    border: 2px solid #f5c2e7;
+}
+
+tooltip label {
+    color: #cdd6f4;
+}
+
+#workspaces button {
+    background: none;
+    box-shadow: none;
+    color: #585b70;
+    padding: 0;
+}
+
+#workspaces button.empty {
+    color: #313244;
+}
+
+#workspaces button.visible {
+    color: #6c7086;
+}
+
+#workspaces button.focused {
+    color: #f5c2e7;
+}
+
+#workspaces button.urgent {
+    color: #f38ba8;
+}
+
+#workspaces button:hover {
+    color: #cdd6f4;
+    text-shadow: inherit;
+}
+
+.module {
+    padding: 0 8px;
+    padding-top: 2px;
+}
+
+.modules-left {
+    margin-left: 8px;
+    margin-right: 4px;
+}
+
+.modules-right {
+    margin-left: 4px;
+    margin-right: 8px;
+}
+
+@keyframes blink {
+    to {
+        color: #cdd6f4;
+    }
+}
+
+#battery.charging {
+    color: #a6e3a1;
+}
+
+#battery.critical:not(.charging) {
+    animation-direction: alternate;
+    animation-duration: 0.5s;
+    animation-iteration-count: infinite;
+    animation-name: blink;
+    animation-timing-function: steps(2);
+    color: #f38ba8;
+}
diff --git a/modules/user/desktop/default.nix b/modules/user/desktop/default.nix
index 8761029..560a242 100644
--- a/modules/user/desktop/default.nix
+++ b/modules/user/desktop/default.nix
@@ -35,7 +35,7 @@
     home = {
       file."Pictures/wallpaper.jpg" = {
         enable = (config.desktop.windowManager != null);
-        source = ./wallpaper.jpg;
+        source = ./wallpaper-${config.desktop.accent}.jpg;
       };
 
       packages = with pkgs; [
diff --git a/modules/user/desktop/wallpaper.jpg b/modules/user/desktop/wallpaper-blue.jpg
index e75494a..e75494a 100644
--- a/modules/user/desktop/wallpaper.jpg
+++ b/modules/user/desktop/wallpaper-blue.jpg
diff --git a/modules/user/desktop/wallpaper-pink.jpg b/modules/user/desktop/wallpaper-pink.jpg
new file mode 100644
index 0000000..a4ca1ba
--- /dev/null
+++ b/modules/user/desktop/wallpaper-pink.jpg