Retheme waybar using block style and catppuccin colours

Add bluetooth module, split some config into separate files
for readability

nixos/home/desktop/wayland/config/hypr/hyprland-H0615.conf

@@ -1,4 +1,4 @@
-source=~/.config/hypr/hyprland.conf
+source=./hyprland.conf
 
 monitor=HDMI-A-1,preferred,auto,auto
 monitor=DP-1,preferred,auto,auto,transform,1

nixos/home/desktop/wayland/config/hypr/hyprland-vanguard.conf

@@ -1,4 +1,4 @@
-source=~/.config/hypr/hyprland.conf
+source=./hyprland.conf
 
 misc {
   vrr = 2

nixos/home/desktop/wayland/config/hypr/hyprland.conf

@@ -10,7 +10,8 @@ exec-once = waybar -c ~/.config/waybar/config-hyprland
 exec-once = eww daemon
 
 # Source a file (multi-file configs)
-source = ~/.config/hypr/macchiato.conf
+source = ~/.config/hypr/keybinds.conf
+source = ~/.config/hypr/window-rules.conf
 
 # Some default env vars.
 env = XCURSOR_SIZE,24
@@ -38,7 +39,7 @@ general {
     gaps_in = 5
     gaps_out = 20
     border_size = 2
-    col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
+    col.active_border = rgba(b4befeff) rgba(b4befeff) 45deg
     col.inactive_border = rgba(595959aa)
 
     layout = dwindle
@@ -93,119 +94,3 @@ gestures {
     # See https://wiki.hyprland.org/Configuring/Variables/ for more
     workspace_swipe = off
 }
-
-# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
-windowrule = float, ^(pavucontrol)$
-windowrule = center, ^(pavucontrol)$
-windowrule = float, ^(marktext)$
-windowrule = center, ^(marktext)$
-windowrule = float, ^(Nxplayer.bin)$
-windowrule = center, ^(Nxplayer.bin)$
-windowrule = float, ^(otpclient)$
-windowrule = move 2% 6%, ^(otpclient)$
-
-windowrule = workspace 1, ^(neovide)$
-windowrule = workspace 2, ^(firefox)$
-windowrule = workspace 2, ^(Chromium-browser)$
-windowrule = workspace 3, ^(org.kde.dolphin)$
-windowrule = workspace 4, ^(thunderbird)$
-windowrule = workspace 4, ^(Mailspring)$
-windowrule = workspace 5, ^(Element)$
-windowrule = workspace 5, ^(Signal)$
-windowrule = workspace 5, ^(discord)$
-windowrule = workspace 6, ^(Steam)$
-windowrule = workspace 7, ^(Bitwarden)$
-windowrule = workspace 8, ^(Nxplayer.bin)$
-
-# See https://wiki.hyprland.org/Configuring/Keywords/ for more
-$mainMod = SUPER
-$term = wezterm
-
-# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
-bind = $mainMod, Return, exec, $term
-bind = $mainMod, Q, killactive,
-bind = $mainMod, E, exec, neovide --multigrid --maximized
-# bind = $mainMod, E, exec, ~/.dotfiles/scripts/power-profiles
-# bind = $mainMod SHIFT, E, exit
-bind = $mainMod, P, exec, ~/.dotfiles/scripts/powermenu
-bind = $mainMod, V, togglefloating,
-bind = $mainMod, Space, exec, rofi -show drun
-bind = $mainMod, S, pseudo, # dwindle
-bind = $mainMod, G, togglesplit, # dwindle
-bind = $mainMod, F1, exec, swaylock
-bind = $mainMod, W, exec, chromium
-bind = $mainMod, F, exec, $term -e ranger
-bind = $mainMod SHIFT, F, exec, dolphin
-bind = $mainMod, M, fullscreen, 1
-
-bind = , XF86AudioMute, exec, pamixer -t
-bind = , XF86AudioRaiseVolume, exec, pamixer -i 2
-bind = , XF86AudioLowerVolume, exec, pamixer -d 2
-
-# Move focus with mainMod + arrow keys
-bind = $mainMod, left, movefocus, l
-bind = $mainMod, H, movefocus, l
-bind = $mainMod, right, movefocus, r
-bind = $mainMod, L, movefocus, r
-bind = $mainMod, up, movefocus, u
-bind = $mainMod, K, movefocus, u
-bind = $mainMod, down, movefocus, d
-bind = $mainMod, J, movefocus, d
-
-bind = $mainMod SHIFT, left, movewindow, l
-bind = $mainMod SHIFT, H, movewindow, l
-bind = $mainMod SHIFT, right, movewindow, r
-bind = $mainMod SHIFT, L, movewindow, r
-bind = $mainMod SHIFT, up, movewindow, u
-bind = $mainMod SHIFT, K, movewindow, u
-bind = $mainMod SHIFT, down, movewindow, d
-bind = $mainMod SHIFT, J, movewindow, d
-
-# Switch workspaces with mainMod + [0-9]
-bind = $mainMod, 1, workspace, 1
-bind = $mainMod, 2, workspace, 2
-bind = $mainMod, 3, workspace, 3
-bind = $mainMod, 4, workspace, 4
-bind = $mainMod, 5, workspace, 5
-bind = $mainMod, 6, workspace, 6
-bind = $mainMod, 7, workspace, 7
-bind = $mainMod, 8, workspace, 8
-bind = $mainMod, 9, workspace, 9
-bind = $mainMod, 0, workspace, 10
-
-# Move active window to a workspace with mainMod + SHIFT + [0-9]
-bind = $mainMod SHIFT, 1, movetoworkspace, 1
-bind = $mainMod SHIFT, 2, movetoworkspace, 2
-bind = $mainMod SHIFT, 3, movetoworkspace, 3
-bind = $mainMod SHIFT, 4, movetoworkspace, 4
-bind = $mainMod SHIFT, 5, movetoworkspace, 5
-bind = $mainMod SHIFT, 6, movetoworkspace, 6
-bind = $mainMod SHIFT, 7, movetoworkspace, 7
-bind = $mainMod SHIFT, 8, movetoworkspace, 8
-bind = $mainMod SHIFT, 9, movetoworkspace, 9
-bind = $mainMod SHIFT, 0, movetoworkspace, 10
-
-bind = $mainMod, period, workspace, m+1
-bind = $mainMod, comma, workspace, m-1
-
-bind = $mainMod SHIFT, period, movetoworkspace, m+1
-bind = $mainMod SHIFT, comma, movetoworkspace, m-1
-
-bind = $mainMod, bracketright, focusmonitor, +1
-bind = $mainMod, bracketleft, focusmonitor, +1
-
-bind = $mainMod SHIFT, bracketright, movecurrentworkspacetomonitor, +1
-bind = $mainMod SHIFT, bracketleft, movecurrentworkspacetomonitor, +1
-
-bind = $mainMod, N, workspace, empty
-bind = $mainMod SHIFT, N, movetoworkspace, empty
-
-bind = $mainMod, C, togglespecialworkspace
-bind = $mainMod SHIFT, C, movetoworkspace, special
-
-bind = $mainMod, tab, workspace, previous
-bind = $mainMod SHIFT, tab, movetoworkspace, previous
-
-# Move/resize windows with mainMod + LMB/RMB and dragging
-bindm = $mainMod, mouse:272, movewindow
-bindm = $mainMod, mouse:273, resizewindow

nixos/home/desktop/wayland/config/hypr/keybinds.conf

@@ -0,0 +1,93 @@
+# See https://wiki.hyprland.org/Configuring/Keywords/ for more
+$mainMod = SUPER
+$term = wezterm
+$browser = librewolf
+
+# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
+bind = $mainMod, Return, exec, $term
+bind = $mainMod, Q, killactive,
+bind = $mainMod, E, exec, neovide --multigrid --maximized
+# bind = $mainMod, E, exec, ~/.dotfiles/scripts/power-profiles
+# bind = $mainMod SHIFT, E, exit
+bind = $mainMod, P, exec, ~/.dotfiles/scripts/powermenu
+bind = $mainMod, V, togglefloating,
+bind = $mainMod, Space, exec, rofi -show drun
+bind = $mainMod, S, pseudo, # dwindle
+bind = $mainMod, G, togglesplit, # dwindle
+bind = $mainMod, F1, exec, swaylock
+bind = $mainMod, W, exec, $browser
+bind = $mainMod, F, exec, $term -e ranger
+bind = $mainMod SHIFT, F, exec, dolphin
+bind = $mainMod, M, fullscreen, 1
+
+bind = , XF86AudioMute, exec, pamixer -t
+bind = , XF86AudioRaiseVolume, exec, pamixer -i 2
+bind = , XF86AudioLowerVolume, exec, pamixer -d 2
+
+# Move focus with mainMod + arrow keys
+bind = $mainMod, left, movefocus, l
+bind = $mainMod, H, movefocus, l
+bind = $mainMod, right, movefocus, r
+bind = $mainMod, L, movefocus, r
+bind = $mainMod, up, movefocus, u
+bind = $mainMod, K, movefocus, u
+bind = $mainMod, down, movefocus, d
+bind = $mainMod, J, movefocus, d
+
+bind = $mainMod SHIFT, left, movewindow, l
+bind = $mainMod SHIFT, H, movewindow, l
+bind = $mainMod SHIFT, right, movewindow, r
+bind = $mainMod SHIFT, L, movewindow, r
+bind = $mainMod SHIFT, up, movewindow, u
+bind = $mainMod SHIFT, K, movewindow, u
+bind = $mainMod SHIFT, down, movewindow, d
+bind = $mainMod SHIFT, J, movewindow, d
+
+# Switch workspaces with mainMod + [0-9]
+bind = $mainMod, 1, workspace, 1
+bind = $mainMod, 2, workspace, 2
+bind = $mainMod, 3, workspace, 3
+bind = $mainMod, 4, workspace, 4
+bind = $mainMod, 5, workspace, 5
+bind = $mainMod, 6, workspace, 6
+bind = $mainMod, 7, workspace, 7
+bind = $mainMod, 8, workspace, 8
+bind = $mainMod, 9, workspace, 9
+bind = $mainMod, 0, workspace, 10
+
+# Move active window to a workspace with mainMod + SHIFT + [0-9]
+bind = $mainMod SHIFT, 1, movetoworkspace, 1
+bind = $mainMod SHIFT, 2, movetoworkspace, 2
+bind = $mainMod SHIFT, 3, movetoworkspace, 3
+bind = $mainMod SHIFT, 4, movetoworkspace, 4
+bind = $mainMod SHIFT, 5, movetoworkspace, 5
+bind = $mainMod SHIFT, 6, movetoworkspace, 6
+bind = $mainMod SHIFT, 7, movetoworkspace, 7
+bind = $mainMod SHIFT, 8, movetoworkspace, 8
+bind = $mainMod SHIFT, 9, movetoworkspace, 9
+bind = $mainMod SHIFT, 0, movetoworkspace, 10
+
+bind = $mainMod, period, workspace, m+1
+bind = $mainMod, comma, workspace, m-1
+
+bind = $mainMod SHIFT, period, movetoworkspace, m+1
+bind = $mainMod SHIFT, comma, movetoworkspace, m-1
+
+bind = $mainMod, bracketright, focusmonitor, +1
+bind = $mainMod, bracketleft, focusmonitor, +1
+
+bind = $mainMod SHIFT, bracketright, movecurrentworkspacetomonitor, +1
+bind = $mainMod SHIFT, bracketleft, movecurrentworkspacetomonitor, +1
+
+bind = $mainMod, N, workspace, empty
+bind = $mainMod SHIFT, N, movetoworkspace, empty
+
+bind = $mainMod, C, togglespecialworkspace
+bind = $mainMod SHIFT, C, movetoworkspace, special
+
+bind = $mainMod, tab, workspace, previous
+bind = $mainMod SHIFT, tab, movetoworkspace, previous
+
+# Move/resize windows with mainMod + LMB/RMB and dragging
+bindm = $mainMod, mouse:272, movewindow
+bindm = $mainMod, mouse:273, resizewindow

nixos/home/desktop/wayland/config/hypr/macchiato.conf

@@ -1,61 +0,0 @@
-$rosewaterAlpha = fff5e0dc
-$flamingoAlpha  = fff2cdcd
-$pinkAlpha      = fff5c2e7
-$mauveAlpha     = ffcba6f7
-$redAlpha       = fff38ba8
-$maroonAlpha    = ffeba0ac
-$peachAlpha     = fffab387
-$yellowAlpha    = fff9e2af
-$greenAlpha     = ffa6e3a1
-$tealAlpha      = ff94e2d5
-$skyAlpha       = ff89dceb
-$sapphireAlpha  = ff74c7ec
-$blueAlpha      = ff89b4fa
-$lavenderAlpha  = ffb4befe
-
-$textAlpha      = ffcdd6f4
-$subtext1Alpha  = ffbac2de
-$subtext0Alpha  = ffa6adc8
-
-$overlay2Alpha  = ff9399b2
-$overlay1Alpha  = ff7f849c
-$overlay0Alpha  = ff6c7086
-
-$surface2Alpha  = ff585b70
-$surface1Alpha  = ff45475a
-$surface0Alpha  = ff313244
-
-$baseAlpha      = ff1e1e2e
-$mantleAlpha    = ff181825
-$crustAlpha     = ff11111b
-
-$rosewater = 0xfff5e0dc
-$flamingo  = 0xfff2cdcd
-$pink      = 0xfff5c2e7
-$mauve     = 0xffcba6f7
-$red       = 0xfff38ba8
-$maroon    = 0xffeba0ac
-$peach     = 0xfffab387
-$yellow    = 0xfff9e2af
-$green     = 0xffa6e3a1
-$teal      = 0xff94e2d5
-$sky       = 0xff89dceb
-$sapphire  = 0xff74c7ec
-$blue      = 0xff89b4fa
-$lavender  = 0xffb4befe
-
-$text      = 0xffcdd6f4
-$subtext1  = 0xffbac2de
-$subtext0  = 0xffa6adc8
-
-$overlay2  = 0xff9399b2
-$overlay1  = 0xff7f849c
-$overlay0  = 0xff6c7086
-
-$surface2  = 0xff585b70
-$surface1  = 0xff45475a
-$surface0  = 0xff313244
-
-$base      = 0xff1e1e2e
-$mantle    = 0xff181825
-$crust     = 0xff11111b

nixos/home/desktop/wayland/config/hypr/window-rules.conf

@@ -0,0 +1,25 @@
+# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
+windowrule = float, ^(pavucontrol)$
+windowrule = center, ^(pavucontrol)$
+windowrule = float, ^(.blueman-manager-wrapped)$
+windowrule = center, ^(.blueman-manager-wrapped)$
+windowrule = float, ^(marktext)$
+windowrule = center, ^(marktext)$
+windowrule = float, ^(Nxplayer.bin)$
+windowrule = center, ^(Nxplayer.bin)$
+windowrule = float, ^(otpclient)$
+windowrule = move 2% 6%, ^(otpclient)$
+
+windowrule = workspace 1, ^(neovide)$
+windowrule = workspace 2, ^(firefox)$
+windowrule = workspace 2, ^(librewolf)$
+windowrule = workspace 2, ^(Chromium-browser)$
+windowrule = workspace 3, ^(org.kde.dolphin)$
+windowrule = workspace 4, ^(thunderbird)$
+windowrule = workspace 4, ^(Mailspring)$
+windowrule = workspace 5, ^(Element)$
+windowrule = workspace 5, ^(Signal)$
+windowrule = workspace 5, ^(discord)$
+windowrule = workspace 6, ^(Steam)$
+windowrule = workspace 7, ^(Bitwarden)$
+windowrule = workspace 8, ^(Nxplayer.bin)$

nixos/home/desktop/wayland/config/waybar/config

@@ -1,30 +1,14 @@
 {
-    "layer": "top", // Waybar at top layer
+    "layer": "top",
-    "position": "top", // Waybar position (top|bottom|left|right)
+    "position": "top",
-    // "height": 30, // Waybar height (to be removed for auto height)
+    "spacing": 4,
-    // "width": 1280, // Waybar width
-    "spacing": 4, // Gaps between modules (4px)
     // Choose the order of the modules
-    "modules-right": ["idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "battery", "battery#bat2", "clock", "tray"],
+    "modules-left": ["custom/launcher", "cpu", "memory", "temperature"],
+    "modules-right": ["pulseaudio", "bluetooth", "network", "backlight", "battery", "battery#bat2", "clock", "tray", "custom/power"],
     // Modules configuration
-    "workspaces": {
+    "custom/launcher":{
-        "disable-scroll": true,
+        "format": " 󰌧 ",
-        "all-outputs": true,
+        "on-click": "rofi -show drun"
-        "format": "{icon}",
-        "format-icons": {
-            "1": "",
-            "2": "󰊯",
-            "3": "",
-            "4": "",
-            "5": "",
-            "6": "",
-            "7": "",
-            "8": "",
-            "9": "",
-            "urgent": "",
-            "focused": "",
-            "default": ""
-        }
     },
     "keyboard-state": {
         "numlock": true,
@@ -35,39 +19,6 @@
             "unlocked": ""
         }
     },
-    "mpd": {
-        "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ",
-        "format-disconnected": "Disconnected ",
-        "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ",
-        "unknown-tag": "N/A",
-        "interval": 2,
-        "consume-icons": {
-            "on": " "
-        },
-        "random-icons": {
-            "off": "<span color=\"#f53c3c\"></span> ",
-            "on": " "
-        },
-        "repeat-icons": {
-            "on": " "
-        },
-        "single-icons": {
-            "on": "1 "
-        },
-        "state-icons": {
-            "paused": "",
-            "playing": ""
-        },
-        "tooltip-format": "MPD (connected)",
-        "tooltip-format-disconnected": "MPD (disconnected)"
-    },
-    "idle_inhibitor": {
-        "format": "{icon}",
-        "format-icons": {
-            "activated": "",
-            "deactivated": ""
-        }
-    },
     "tray": {
         // "icon-size": 21,
         "spacing": 10
@@ -113,7 +64,6 @@
         "bat": "BAT2"
     },
     "network": {
-        // "interface": "wlp2*", // (Optional) To force the use of this interface
         "format-wifi": "{essid} ({signalStrength}%) 󰖩",
         "format-ethernet": "{ipaddr}/{cidr} 󰈁",
         "tooltip-format": "{ifname} via {gwaddr} 󰈁",
@@ -121,6 +71,14 @@
         "format-disconnected": "Disconnected 󰈂",
         "format-alt": "{ifname}: {ipaddr}/{cidr}"
     },
+    "bluetooth": {
+        "format": "󰂯 {status}",
+        "format-disabled": "󰂲 {status}",
+        "format-off": "󰂲 {status}",
+        "format-on": "󰂯 {status}",
+        "format-connected": "󰂱 {device_alias}",
+        "on-click": "blueman-manager"
+    },
     "pulseaudio": {
         "scroll-step": 2, // %, can be a float
         "format": "{volume}% {icon} {format_source}",
@@ -140,6 +98,10 @@
         },
         "on-click": "pavucontrol"
     },
+    "custom/power":{
+        "format": " 󰐥 ",
+        "on-click": "~/.dotfiles/scripts/powermenu"
+    }
 }
 
 // vim: ft=json

nixos/home/desktop/wayland/config/waybar/config-hyprland

@@ -1,16 +1,14 @@
 {
-    "include": "~/.config/waybar/config",
+    "include": "./config",
-    "modules-left": ["wlr/workspaces", "hyprland/submap"],
+    "modules-center": ["wlr/workspaces"],
-    "modules-center": ["hyprland/window"],
     // Modules configuration
     "wlr/workspaces": {
         "disable-scroll": true,
         "all-outputs": true,
         "format": "{icon}",
         "format-icons": {
-            "1:Web": "",
+            "1": "",
-            "2:Term": "",
+            "2": "",
-            "3:Code": ""
             "3": "",
             "4": "",
             "5": "",
@@ -20,18 +18,9 @@
             "9": "",
             "urgent": "",
             "focused": "",
-            "default": "",
-            "1:web": "",
-            "2:code": "",
-            "3:term": "",
-            "4:work": "",
-            "5:music": "",
-            "6:docs": "",
-            "urgent": "",
-            "focused": "",
             "default": ""
         }
-    },
+    }
 }
 
 // vim: ft=json

nixos/home/desktop/wayland/config/waybar/config-sway

@@ -1,5 +1,5 @@
 {
-    "include": "~/.config/waybar/config",
+    "include": "./config",
     "modules-left": ["sway/workspaces", "sway/mode", "sway/scratchpad"],
     "modules-center": ["sway/window"],
     // Modules configuration

nixos/home/desktop/wayland/config/waybar/macchiato.css

@@ -0,0 +1,37 @@
+/*
+*
+* Catppuccin Macchiato palette
+* Maintainer: rubyowo
+*
+*/
+
+@define-color base   #24273a;
+@define-color mantle #1e2030;
+@define-color crust  #181926;
+
+@define-color text     #cad3f5;
+@define-color subtext0 #a5adcb;
+@define-color subtext1 #b8c0e0;
+
+@define-color surface0 #363a4f;
+@define-color surface1 #494d64;
+@define-color surface2 #5b6078;
+
+@define-color overlay0 #6e738d;
+@define-color overlay1 #8087a2;
+@define-color overlay2 #939ab7;
+
+@define-color blue      #8aadf4;
+@define-color lavender  #b7bdf8;
+@define-color sapphire  #7dc4e4;
+@define-color sky       #91d7e3;
+@define-color teal      #8bd5ca;
+@define-color green     #a6da95;
+@define-color yellow    #eed49f;
+@define-color peach     #f5a97f;
+@define-color maroon    #ee99a0;
+@define-color red       #ed8796;
+@define-color mauve     #c6a0f6;
+@define-color pink      #f5bde6;
+@define-color flamingo  #f0c6c6;
+@define-color rosewater #f4dbd6;

nixos/home/desktop/wayland/config/waybar/style.css

@@ -1,319 +1,130 @@
-/*
+@import 'macchiato.css';
-*
-* Catppuccin Mocha palette
-* Maintainer: rubyowo
-*
-*/
-
-@define-color base   #24273a;
-@define-color mantle #1e2030;
-@define-color crust  #181926;
-
-@define-color text     #cad3f5;
-@define-color subtext0 #a5adcb;
-@define-color subtext1 #b8c0e0;
-
-@define-color surface0 #363a4f;
-@define-color surface1 #494d64;
-@define-color surface2 #5b6078;
-
-@define-color overlay0 #6e738d;
-@define-color overlay1 #8087a2;
-@define-color overlay2 #939ab7;
-
-@define-color blue      #8aadf4;
-@define-color lavender  #b7bdf8;
-@define-color sapphire  #7dc4e4;
-@define-color sky       #91d7e3;
-@define-color teal      #8bd5ca;
-@define-color green     #a6da95;
-@define-color yellow    #eed49f;
-@define-color peach     #f5a97f;
-@define-color maroon    #ee99a0;
-@define-color red       #ed8796;
-@define-color mauve     #c6a0f6;
-@define-color pink      #f5bde6;
-@define-color flamingo  #f0c6c6;
-@define-color rosewater #f4dbd6;
 
 * {
-  /* `otf-font-awesome` is required to be installed for icons */
+  border: none;
-  font-family: FiraCode Nerd Font, FontAwesome, Roboto, Helvetica, Arial, sans-serif;
+  border-radius: 10px;
+  font-family: "FiraCode Nerd Font";
   font-size: 16px;
 }
 
 window#waybar {
-  background-color: @base;
+  background: transparent;
-  /* border-bottom: 3px solid rgba(100, 114, 125, 0.5); */
-  color: @text;
-  transition-property: background-color;
-  transition-duration: 0.5s;
 }
-
 window#waybar.hidden {
   opacity: 0.2;
 }
-
+#window {
-/*
+  margin-top: 6px;
-window#waybar.empty {
+  padding-left: 10px;
-    background-color: transparent;
+  padding-right: 10px;
-}
+  border-radius: 10px;
-window#waybar.solo {
+  transition: none;
-    background-color: #FFFFFF;
+  color: transparent;
-}
+  background: transparent;
-*/
-
-window#waybar.termite {
-  background-color: #3f3f3f;
 }
 
-window#waybar.chromium {
+#workspaces {
-  background-color: #000000;
+  margin-top: 6px;
-  border: none;
+  margin-left: 12px;
+  font-size: 4px;
+  margin-bottom: 0px;
+  border-radius: 10px;
+  background: @maroon;
+  transition: none;
 }
-
-button {
-  /* Use box-shadow instead of border so the text isn't offset */
-  box-shadow: inset 0 -3px transparent;
-  /* Avoid rounded borders under each button name */
-  border: none;
-  border-radius: 0;
-}
-
-/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
-button:hover {
-  background: inherit;
-  box-shadow: inset 0 -3px @mantle;
-}
-
 #workspaces button {
-  padding: 0 5px;
+  transition: none;
-  background-color: transparent;
+  color: @overlay0;
-  color: @surface2;
+  box-shadow: inset 0 -3px transparent;
+  font-size: 20px;
+  border-radius: 2px;
 }
-
 #workspaces button.active,
 #workspaces button.focused {
-  color: @text;
+  color: @base;
-  box-shadow: inset 0 -2px;
+}
+#workspaces button:hover {
+  transition: none;
+  box-shadow: inherit;
+  text-shadow: inherit;
+  color: @base;
+  border-color: #e8a2af;
+  color: @base;
+}
+#workspaces button.focused:hover {
+  color: @base;
 }
 
-#workspaces button.urgent {
+#custom-launcher,
-  color: @red;
-}
-
-#mode {
-  background-color: #64727d;
-  border-bottom: 3px solid #ffffff;
-}
-
-#clock,
-#battery,
 #cpu,
 #memory,
-#disk,
 #temperature,
-#backlight,
-#network,
 #pulseaudio,
-#wireplumber,
+#bluetooth,
-#custom-media,
+#network,
+#backlight,
+#battery,
+#clock,
 #tray,
-#mode,
+#custom-power {
-#idle_inhibitor,
+  margin-top: 6px;
-#scratchpad,
+  margin-left: 8px;
-#mpd {
+  padding-left: 10px;
-  padding: 0 10px;
+  padding-right: 10px;
-  background-color: @crust;
+  margin-bottom: 0px;
-  color: @text;
+  border-radius: 10px;
+  transition: none;
+  color: @crust;
+  background: @lavender;
 }
 
-#window,
+#cpu {
-#workspaces {
+  background: @pink;
-  margin: 0 4px;
 }
-
+#memory {
-/* If workspaces is the leftmost module, omit left margin */
+  background: @mauve;
-.modules-left > widget:first-child > #workspaces {
-  margin-left: 0;
 }
-
+#temperature {
-/* If workspaces is the rightmost module, omit right margin */
+  background: @red;
-.modules-right > widget:last-child > #workspaces {
-  margin-right: 0;
 }
-
+#pulseaudio {
-/*
+  background: @yellow;
-#clock {
+}
-  background-color: #64727d;
+#bluetooth {
+  background: @green;
+}
+#network {
+  background: @teal;
+}
+#backlight {
+  background: @sky;
 }
-
 #battery {
-  background-color: #ffffff;
+  background: @sapphire;
-  color: #000000;
 }
-
 #battery.charging,
 #battery.plugged {
-  color: #ffffff;
+  background-color: @sapphire;
-  background-color: #26a65b;
 }
-
-@keyframes blink {
-  to {
-    background-color: #ffffff;
-    color: #000000;
-  }
-}
-
 #battery.critical:not(.charging) {
-  background-color: #f53c3c;
+  background-color: @sapphire;
-  color: #ffffff;
   animation-name: blink;
   animation-duration: 0.5s;
   animation-timing-function: linear;
   animation-iteration-count: infinite;
   animation-direction: alternate;
 }
-
+@keyframes blink {
-label:focus {
+  to {
-  background-color: #000000;
+    color: @red;
+  }
+}
+#clock {
+  background: @blue;
 }
 
-#cpu {
+#tray,
-  background-color: #2ecc71;
+#custom-launcher,
-  color: #000000;
+#custom-power {
+  font-size: 20px;
 }
-
-#memory {
-  background-color: #9b59b6;
-}
-
-#disk {
-  background-color: #964b00;
-}
-
-#backlight {
-  background-color: #90b1b1;
-}
-
-#network {
-  background-color: #2980b9;
-}
-
-#network.disconnected {
-  background-color: #f53c3c;
-}
-
-#pulseaudio {
-  background-color: #f1c40f;
-  color: #000000;
-}
-
-#pulseaudio.muted {
-  background-color: #90b1b1;
-  color: #2a5c45;
-}
-
-#wireplumber {
-  background-color: #fff0f5;
-  color: #000000;
-}
-
-#wireplumber.muted {
-  background-color: #f53c3c;
-}
-
-#custom-media {
-  background-color: #66cc99;
-  color: #2a5c45;
-  min-width: 100px;
-}
-
-#custom-media.custom-spotify {
-  background-color: #66cc99;
-}
-
-#custom-media.custom-vlc {
-  background-color: #ffa000;
-}
-
-#temperature {
-  background-color: #f0932b;
-}
-
-#temperature.critical {
-  background-color: #eb4d4b;
-}
-
-#tray {
-  background-color: #2980b9;
-}
-
-#tray > .passive {
-  -gtk-icon-effect: dim;
-}
-
-#tray > .needs-attention {
-  -gtk-icon-effect: highlight;
-  background-color: #eb4d4b;
-}
-
-#idle_inhibitor {
-  background-color: #2d3436;
-}
-
-#idle_inhibitor.activated {
-  background-color: #ecf0f1;
-  color: #2d3436;
-}
-
-#mpd {
-  background-color: #66cc99;
-  color: #2a5c45;
-}
-
-#mpd.disconnected {
-  background-color: #f53c3c;
-}
-
-#mpd.stopped {
-  background-color: #90b1b1;
-}
-
-#mpd.paused {
-  background-color: #51a37a;
-}
-
-#language {
-  background: #00b093;
-  color: #740864;
-  padding: 0 5px;
-  margin: 0 5px;
-  min-width: 16px;
-}
-
-#keyboard-state {
-  background: #97e1ad;
-  color: #000000;
-  padding: 0 0px;
-  margin: 0 5px;
-  min-width: 16px;
-}
-
-#keyboard-state > label {
-  padding: 0 5px;
-}
-
-#keyboard-state > label.locked {
-  background: rgba(0, 0, 0, 0.2);
-}
-
-#scratchpad {
-  background: rgba(0, 0, 0, 0.2);
-}
-
-#scratchpad.empty {
-  background-color: transparent;
-}
-*/