cleanup waybar config

waybar/.config/waybar/config

@@ -1,10 +1,11 @@
 {
   "layer": "top",
   "position": "top",
-  "font": "Fira Code Bold 12",
+  "font": "Fira Code 11",
-  "margin": 5,
+  "margin-top": 6,
+  "margin-left": 6,
+  "margin-right": 6,
 
-// ------ Left Module ------ //
   "modules-left": [
     "hyprland/workspaces",
     "niri/workspaces",
@@ -13,22 +14,38 @@
     "niri/window"
   ],
 
+  "modules-center": [
+    "clock#1",
+    "clock#2",
+    "clock#3"
+  ],
+
+  "modules-right": [
+    "tray",
+    "pulseaudio",
+    "backlight",
+    "memory",
+    "cpu",
+    "network",
+    "battery",
+    "keyboard-state"
+  ],
+
   "hyprland/workspaces": {
+    "format": "{name}",
     "on-scroll-up": "hyprctl dispatch workspace m-1",
     "on-scroll-down": "hyprctl dispatch workspace m+1",
-		  "disable-scroll": true,
+    "disable-scroll": true
-		  "format": "{name}",
   },
 
   "hyprland/window": {
     "max-length": 200,
-    "separate-outputs": true,
+    "separate-outputs": true
   },
 
   "niri/workspaces": {
     "format": "{value}",
-	  "format-icons": {
+    "format-icons": {}
-	  }
   },
 
   "niri/window": {
@@ -41,19 +58,9 @@
   "wlr/taskbar": {
     "format": "{icon}",
     "tooltip-format": "{title}",
-        "on-click": "activate",
+    "on-click": "activate"
-        // "on-click-middle": "close",
-        // "on-click-right": "fullscreen"
   },
 
-
-// ------ Center Module ------ //
-	"modules-center": [
-		"clock#1",
-		"clock#2",
-		"clock#3",
-	],
-  
   "clock#1": {
     "format": "{:%A}",
     "tooltip": false
@@ -67,19 +74,6 @@
     "tooltip": true
   },
 
-
-// ------ Right Module ------- //
-  "modules-right": [
-		"tray",
-		"pulseaudio",
-    "backlight",
-    "memory",
-		"cpu",
-    "network",
-		"battery",
-		"keyboard-state"
-	],
-	
   "keyboard-state": {
     "numlock": true,
     "capslock": false,
@@ -91,18 +85,17 @@
       "unlocked": "⚪"
     }
   },
+
   "pulseaudio": {
     "format": "{icon}  {volume:2}%",
     "format-bluetooth": "{icon}  {volume:2}% ",
-		"format-muted": "🔇 MUTED",
+    "format-muted": "🔇 Muted",
     "format-icons": {
-			"headphones": "",
+      "default": ["", ""],
-			"default": [
+      "default-muted": ""
-				"",
-				""
-			]
     },
     "scroll-step": 6,
+    "tooltip": true,
     "on-click": "wpctl set-mute @DEFAULT_SINK@ toggle",
     "on-click-right": "pwvucontrol"
   },
@@ -118,6 +111,7 @@
     "interval": 5,
     "format": "{used:0.2f}/{total:0.2f} GB"
   },
+
   "cpu": {
     "interval": 1,
     "format": "{icon0}{icon1}{icon2}{icon3}{icon4}{icon5}{icon6}{icon7}{icon8}{icon9}{icon10}{icon11}{icon12}{icon13}{icon14}{icon15}",
@@ -141,18 +135,14 @@
     },
     "format": "{icon}  {capacity}%",
     "format-charging": " {icon}  {capacity}%",
-		"format-icons": [
+    "format-icons": ["", "", "", "", ""]
-			"",
-			"",
-			"",
-			"",
-			""
-		]
   },
+
   "tray": {
-		"icon-size": 20,
+    "icon-size": 18,
-    "spacing": 7
+    "spacing": 8
   },
+
   "network": {
     "interface": "wlan0",
     "format": "{ifname}",
@@ -162,6 +152,6 @@
     "tooltip-format": "{ifname} via {gwaddr} 󰊗 ",
     "tooltip-format-wifi": "Up: {bandwidthUpBytes} - Down: {bandwidthDownBytes}",
     "tooltip-format-ethernet": "{ifname}  ",
-    "tooltip-format-disconnected": "Disconnected",
+    "tooltip-format-disconnected": "Disconnected"
-  },
   }
+}

waybar/.config/waybar/style.css

@@ -5,16 +5,24 @@
   border-radius: 10px;
 }
 
-.modules-center {
+.modules-center {}
-}
 
 window#waybar {
   background-color: transparent;
 }
 
-#clock.1, #clock.2, #clock.3,
+#clock.1,
-#pulseaudio, #memory, #cpu, #network, #mpd,
+#clock.2,
-#battery, #disk, #backlight, #tray,
+#clock.3,
+#pulseaudio,
+#memory,
+#cpu,
+#network,
+#mpd,
+#battery,
+#disk,
+#backlight,
+#tray,
 #keyboard-state {
   background: rgba(20, 24, 20, 0.64);
   text-shadow: 2px 3px 2px rgba(20, 20, 20, 0.3);
@@ -23,6 +31,12 @@ window#waybar {
   margin-left: 2px;
   margin-right: 2px;
   color: white;
+  border: 2px solid transparent;
+}
+
+#pulseaudio:hover {
+  border: 2px solid rgba(40, 170, 120, 1);
+  background: rgba(20, 24, 20, 0.64);
 }
 
 #window {
@@ -37,27 +51,30 @@ window#waybar.empty #window {
   background: transparent;
 }
 
-#workspaces, #taskbar {
+#workspaces,
+#taskbar {
   background: rgba(18, 26, 23, 0.56);
 }
 
-#workspaces button, #taskbar button {
+#workspaces button,
+#taskbar button {
   padding: 1px 4px;
   color: #fafafa;
   border: 2px solid transparent;
 }
 
 /* button.active for hyprland, button.focused for sway */
-#workspaces button.active, #taskbar button.active {
+#workspaces button.active,
+#taskbar button.active {
   color: #ffffff;
   border: 2px solid rgba(40, 170, 120, 1);
 }
 
-#workspaces button:hover, #taskbar button:hover {
+#workspaces button:hover,
+#taskbar button:hover {
   color: black;
-  background-color: rgba(126,255,180,0.4);
+  background-color: rgba(126, 255, 180, 0.4);
   border: 2px solid rgba(80, 230, 180, 1);
   box-shadow: inherit;
   text-shadow: inherit;
 }
-