2 files changed, 67 insertions, 74 deletions
diff --git a/dotfiles/.config/waybar/config b/dotfiles/.config/waybar/config
index 6ff853e..af43745 100644
--- a/dotfiles/.config/waybar/config
+++ b/dotfiles/.config/waybar/config
@@ -4,30 +4,29 @@
     "height": 25,
     "modules-left": [
         "sway/workspaces",
-        "custom/right-arrow-black",
         "sway/mode",
+        "custom/left-decorator-black",
         "mpd",
-        "pulseaudio",
-        "custom/right-arrow-cyan"
+        "pulseaudio"
+    ],
+    "modules-center": [
+        "clock",
+        "custom/weather"
     ],
-    "modules-center": ["clock"],
     "modules-right": [
-        "custom/left-arrow-cyan",
         "custom/swaykbd",
-        "custom/weather",
         "backlight",
-        "custom/left-arrow-gray",
         "network",
         "battery#bat0",
         "battery#bat1",
-        "custom/left-arrow-black",
+        "custom/right-decorator-black",
         "tray"
     ],
     "sway/mode": {
         "format": "<span style=\"italic\">{}</span>"
     },
     "mpd": {
-        "format": " {stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {title} [{elapsedTime:%M:%S}] ",
+        "format": " {stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon} {artist} - {title} [{elapsedTime:%M:%S}]",
         "format-disconnected": " Disconnected ",
         "format-stopped": " {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ",
         "unknown-tag": "N/A",
@@ -36,8 +35,7 @@
             "on": " "
         },
         "random-icons": {
-            "off": "<span color=\"#f53c3c\"></span> ",
-            "on": " "
+            "on": ""
         },
         "repeat-icons": {
             "on": " "
@@ -46,8 +44,8 @@
             "on": "1 "
         },
         "state-icons": {
-            "paused": "",
-            "playing": ""
+            "paused": "<span color=\"#b2872f\"></span>",
+            "playing": "<span color=\"#5b8277\"></span>"
         },
         "tooltip-format": "MPD (connected)",
         "tooltip-format-disconnected": "MPD (disconnected)"
@@ -89,24 +87,36 @@
     },
     "battery#bat0": {
         "bat": "BAT0",
-        "format": "{capacity}% {icon}",
-        "format-charging": "{capacity}% ",
-        "format-plugged": "{capacity}% ",
-        "format-icons": ["", "", "", "", ""]
+        "format": "{icon} {capacity}%",
+        "format-charging": " <span color=\"#5b8277\"></span> {capacity}%",
+        "format-plugged": "<span color=\"#5b8277\"></span> {capacity}%",
+        "format-icons": [
+            "<span color=\"#b73030\"></span>",
+            "<span color=\"#b2872f\"></span>",
+            "<span color=\"#5b8277\"></span>",
+            "<span color=\"#5b8277\"></span>",
+            "<span color=\"#5b8277\"></span>"
+        ]
     },
     "battery#bat1": {
         "bat": "BAT1",
-        "format": "{capacity}% {icon}",
-        "format-charging": "{capacity}% ",
-        "format-plugged": "{capacity}% ",
-        "format-icons": ["", "", "", "", ""]
+        "format": "{icon} {capacity}%",
+        "format-charging": " <span color=\"#5b8277\"></span> {capacity}%",
+        "format-plugged": "<span color=\"#5b8277\"></span> {capacity}%",
+        "format-icons": [
+            "<span color=\"#b73030\"></span>",
+            "<span color=\"#b2872f\"></span>",
+            "<span color=\"#5b8277\"></span>",
+            "<span color=\"#5b8277\"></span>",
+            "<span color=\"#5b8277\"></span>"
+        ]
     },
     "network": {
         // "interface": "wlp2*", // (Optional) To force the use of this interface
-        "format-wifi": "{essid}: {ipaddr} ",
-        "format-ethernet": "{ifname}: {ipaddr} ",
-        "format-linked": "{ifname} (No IP) ",
-        "format-disconnected": "Disconnected ⚠",
+        "format-wifi": "<span color=\"#5b8277\"></span> {essid}: {ipaddr}",
+        "format-ethernet": "<span color=\"#5b8277\"></span> {ifname}: {ipaddr}",
+        "format-linked": "<span color=\"#5b8277\"></span> {ifname} (No IP)",
+        "format-disconnected": "<span color=\"#b73030\">⚠</span> Disconnected",
         "format-alt": "{ifname}: {ipaddr}/{cidr}"
     },
     "custom/left-arrow-cyan": {
@@ -124,11 +134,17 @@
     "custom/right-arrow-black": {
         "format": ""
     },
+    "custom/left-decorator-black": {
+        "format": ""
+    },
+    "custom/right-decorator-black": {
+        "format": ""
+    },
     "pulseaudio": {
-        // "scroll-step": 1, // %, can be a float
-        "format": "{volume}% {icon}",
-        "format-bluetooth": "{volume}% {icon} {format_source}",
-        "format-muted": "",
+        "scroll-step": 5, // %, can be a float
+        "format": "<span color=\"#5b8277\">{icon}</span> {volume}%",
+        "format-bluetooth": "<span color=\"#5b8277\">{icon}</span> {volume}% {format_source}",
+        "format-muted": "<span color=\"#b73030\"></span>",
         "format-source": "{volume}% ",
         "format-source-muted": "",
         "format-icons": {
@@ -153,7 +169,7 @@
         "exec": "$HOME/.scripts/i3barweather"
     },
     "custom/swaykbd": {
-        "format": "{} ",
+        "format": "<span color=\"#5b8277\"></span> {}",
         "exec": "$HOME/.scripts/swaykbd"
     },
     "custom/media": {
diff --git a/dotfiles/.config/waybar/style.css b/dotfiles/.config/waybar/style.css
index 2223844..44bae1e 100644
--- a/dotfiles/.config/waybar/style.css
+++ b/dotfiles/.config/waybar/style.css
@@ -1,16 +1,15 @@
 * {
     font-size: 11px;
-    font-family: "FuraCode Nerd Font Mono";
+    font-family: "BlexMono Nerd Font Mono";
     min-height: 0;
 }
-
 window#waybar {
-    background: rgba(26, 26, 26, 0.75);
-    color: #fdf6e3;
+    background: rgba(27, 30, 37, 0.95);
+    color: #e5e9f0;
     min-height: 0;
 }
 #custom-right-arrow-cyan, #custom-left-arrow-cyan {
-    color: #8ec07c;
+    color: #89b699;
     font-size: 20px;
 }
 #custom-right-arrow-black, #custom-left-arrow-black {
@@ -19,27 +18,24 @@ window#waybar {
 }
 #custom-left-arrow-gray {
     color: #191919;
-    background: #8ec07c;
+    background: #89b699;
     font-size: 20px;
 }
 #custom-right-arrow-black {
-    background: #8ec07c;
+    background: #89b699;
 }
 #custom-left-arrow-black {
     background: #191919;
 }
-#clock.1 {
-    background: #2D888D;
-}
-#clock.2 {
-    color: #1E1F23;
-    background: #DCDCCC;
-}
-#clock.3 {
-    background: #E00421;
+#custom-left-decorator-black,
+#custom-right-decorator-black {
+    font-size: 20px;
+    background: rgba(27, 30, 37, 0.95);
+    color: #000000;
 }
+#tray,
 #workspaces {
-    padding-left: 8px;
+    padding: 0 8px;
     background: #000000;
 }
 #workspaces button {
@@ -47,7 +43,7 @@ window#waybar {
     color: #fdf6e3;
 }
 #workspaces button.focused {
-    color:  #8ec07c;
+    color:  #5b8277;
 }
 #workspaces button:hover {
     box-shadow: inherit;
@@ -58,37 +54,18 @@ window#waybar {
     border-radius: 0;
     background: #0C3D27;
 }
-#tray {
-    background: #000000;
-}
-#memory {
-    background: #ff6e67;
-}
-#pulseaudio,
 #mpd,
-#temperature,
+#clock,
+#battery,
+#network,
 #backlight,
+#pulseaudio,
+#temperature,
 #custom-weather,
 #custom-rec-status,
 #custom-swaykbd {
-    color: #000000;
-    background: #8ec07c;
     padding: 0 8px;
 }
-#cpu {
-    background: #f1fa8c;
-}
-#network,
-#battery{
-    background: #191919;
-    padding: 0 8px;
-}
-#battery.charging {
-    color: #8ec07c;
-}
-#memory, #cpu, #tray {
-    color: #1E1F23;
-}
-#clock{
-    padding: 0 16px;
+#custom-weather {
+    color: #5b8277;
 }