5 files changed, 14 insertions, 8 deletions
diff --git a/waybar/.config/waybar/config.jsonc b/waybar/.config/waybar/config.jsonc
index 892da84..eedc711 100644
--- a/waybar/.config/waybar/config.jsonc
+++ b/waybar/.config/waybar/config.jsonc
@@ -81,7 +81,7 @@
     "on-click-right": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle",
     "tooltip-format": "Playing at {volume}%",
     "scroll-step": 5,
-    "format-muted": "vol <span style='italic' weight='900' color='#df6124'>muted</span>",
+    "format-muted": "vol <span style='italic' weight='900' color='#999999'>muted</span>",
     "format-icons": {
       "headphone": "",
       "default": ["", "", ""]
@@ -108,6 +108,6 @@
       "tooltip": true,
       "format": "{}",
       "return-type": "json",
-      "on-click": "sh -c 'wal -i $(find ~/Pictures/wallpapers -type f | shuf -n 1) 2>/dev/null || wal -r'"
+      "on-click": "sh -c '~/.config/niri/apply-colors.sh \"$(find ~/Pictures/wallpapers -type f | shuf -n 1)\"'"
     }
 }
diff --git a/waybar/.config/waybar/style.css b/waybar/.config/waybar/style.css
index 2c4e35d..cf8dbee 100644
--- a/waybar/.config/waybar/style.css
+++ b/waybar/.config/waybar/style.css
@@ -1,4 +1,4 @@
-@import "../../.cache/wal/colors-waybar.css";
+@import "/home/seraphim/dotfiles-gentoo/waybar/.config/waybar/theme.css";
 @define-color bg @background;
 @define-color fg @foreground;
 
@@ -17,7 +17,7 @@ window#waybar {
 
 #waybar > box {
   border-radius: 0px;
-  border-bottom: 1.5px solid rgba(255, 255, 255, 0.1);
+  border-bottom: 1.5px solid alpha(@foreground, 0.12);
   margin: 0px 0px 2px 0px;
   background-color: @background;
   box-shadow: 0 1px 2px rgba(0, 0, 0, 1);
@@ -52,7 +52,7 @@ window#waybar {
 
 #workspaces button.active {
   color: @background;
-  background-color: #df6124;
+  background-color: @foreground;
   padding: 0px 4px;
   margin: 4px 2px;
   opacity: 1.0;
@@ -146,20 +146,21 @@ tooltip label {
 
 @keyframes blink {
   to {
-    color: #4a4a4a;
+    color: #999999;
   }
 }
 
 #pulseaudio.warning,
 #memory.warning,
 #cpu.warning {
-  color: #e3c1b1;
+  color: alpha(@foreground, 0.65);
   background-color: @background;
 }
 
 #pulseaudio.critical,
 #memory.critical,
 #cpu.critical {
-  color: #df6124;
+  color: @foreground;
   background-color: @background;
+  font-weight: 900;
 }
diff --git a/waybar/.config/waybar/theme-dark.css b/waybar/.config/waybar/theme-dark.css
new file mode 100644
index 0000000..d88a91d
--- /dev/null
+++ b/waybar/.config/waybar/theme-dark.css
@@ -0,0 +1,2 @@
+@define-color background #111111;
+@define-color foreground #fafafa;
diff --git a/waybar/.config/waybar/theme-light.css b/waybar/.config/waybar/theme-light.css
new file mode 100644
index 0000000..b757ab6
--- /dev/null
+++ b/waybar/.config/waybar/theme-light.css
@@ -0,0 +1,2 @@
+@define-color background #fafafa;
+@define-color foreground #111111;
diff --git a/waybar/.config/waybar/theme.css b/waybar/.config/waybar/theme.css
new file mode 120000
index 0000000..aea3c67
--- /dev/null
+++ b/waybar/.config/waybar/theme.css
@@ -0,0 +1 @@
+theme-dark.css
+\ No newline at end of file