Merge remote-tracking branch 'refs/remotes/origin/main'

config

@@ -1,24 +1,25 @@
 {
-    "layer": "top",
-    "position": "top",
-    "modules-left": ["custom/haskell", "hyprland/workspaces"],
-    "modules-center": ["clock", "custom/bongobar"],
-    "modules-right": ["pulseaudio", "backlight", "battery", "tray", "custom/lock", "custom/power"],
-    "custom/haskell": {
-        "format": "λ",
-        "tooltip": false
-    },
-    "hyprland/workspaces": {
-        "disable-scroll": true,
-        "format": "{id}",
-        "on-click": "activate"
-    },
+    "layer": "top", // Waybar at top layer
+    "position": "top", // Waybar position (top|bottom|left|right)
+    // "width": 1280, // Waybar width
+    // Choose the order of the modules
+    "modules-left": ["hyprland/workspaces"],
+    "modules-center": ["custom/music"],
+    "modules-right": ["pulseaudio", "backlight", "battery", "custom/wifi", "clock", "tray", "custom/lock", "custom/power"],
+    "wlr/workspaces": {
+         "disable-scroll": true,
+         "sort-by-name": true,
+         "format": " {icon} ",
+         "format-icons": {
+             "default": "",
+         },
+     },
     "tray": {
         "icon-size": 21,
         "spacing": 10
     },
     "custom/music": {
-        "format": "{}",
+        "format": "  {}",
         "escape": true,
         "interval": 5,
         "tooltip": false,
@@ -34,38 +35,42 @@
     },
     "backlight": {
         "device": "intel_backlight",
-        "format": "BRI {percent}%"
+        "format": "{icon}",
+        "format-icons": ["", "", "", "", "", "", "", "", ""]
     },
     "battery": {
         "states": {
             "warning": 30,
             "critical": 15
         },
-        "format": "BAT {capacity}%",
-        "format-charging": "BAT {capacity}% +",
-        "format-plugged": "BAT {capacity}% ="
+        "format": "{capacity}%",
+        "format-charging": "{capacity}% (CHRG)",
+        "format-plugged": "{capacity}% (PLUG)",
+        "format-alt": "{capacity}%",
+        "format-icons": ["", "",  "", "", "", "", "", "", "", "", "", ""]
     },
     "pulseaudio": {
-        "format": "VOL {volume}%",
-        "format-muted": "VOL MUTE",
+        // "scroll-step": 1, // %, can be a float
+        "format": "{icon} {volume}%",
+        "format-muted": "",
+        "format-icons": {
+            "default": ["", "", " "]
+        },
         "on-click": "pavucontrol"
     },
-    "custom/bongobar": {
-      "exec": "$HOME/.cargo/bin/bongobar",
-      "return-type": "json",
-      "format": "    {}",
-      "restart-interval": 1,
-      "tooltip": true,
-      "escape": false
+    "custom/wifi": {
+        "tooltip": false,
+        "on-click": "hyprctl dispatch exec [float] 'alacritty -e nmtui'",
+        "format": "WIFI"
     },
     "custom/lock": {
         "tooltip": false,
         "on-click": "sh -c '(sleep 0.5s; swaylock --grace 0)' & disown",
-        "format": "LOCK"
+        "format": "",
     },
     "custom/power": {
         "tooltip": false,
         "on-click": "wlogout &",
-        "format": "PWR"
+        "format": "襤"
     }
 }

style.css

@@ -1,22 +1,40 @@
 @import "mocha.css";
 
 * {
-  font-family: "FantasqueSansMono Nerd Font", monospace;
-  font-size: 15px;
+  font-family: FantasqueSansMono Nerd Font;
+  font-size: 17px;
   min-height: 0;
 }
 
 #waybar {
-  background: @base;
+  background: transparent;
   color: @text;
-  border-radius: 0;
-  margin: 0;
-  padding: 0;
+  margin: 5px 5px;
+}
+
+#workspaces {
+  border-radius: 1rem;
+  margin: 5px;
+  background-color: @surface0;
+  margin-left: 1rem;
+}
+
+#workspaces button {
+  color: @lavender;
+  border-radius: 1rem;
+  padding: 0.4rem;
+}
+
+#workspaces button.active {
+  color: @sky;
+  border-radius: 1rem;
+}
+
+#workspaces button:hover {
+  color: @sapphire;
+  border-radius: 1rem;
 }
 
-#workspaces,
-#workspaces button,
-#custom-haskell,
 #custom-music,
 #tray,
 #backlight,
@@ -25,44 +43,15 @@
 #pulseaudio,
 #custom-lock,
 #custom-power {
-  border-radius: 0;
-  padding: 4px 8px;
-  margin: 0;
-  background: transparent;
-}
-
-#custom-haskell {
-  color: @mauve;
-  font-size: 16px;
-  font-weight: 900;
-}
-
-#workspaces {
-  background: transparent;
-}
-
-#workspaces button {
-  color: @overlay1;
-  box-shadow: none;
-  border: none;
-  outline: none;
-}
-
-#workspaces button.active {
-  color: #eb3489;
-  font-weight: bold;
-}
-
-#workspaces button:hover {
-  color: @text;
-  font-weight: bold;
-  box-shadow: none;
-  border: none;
-  background: transparent;
+  background-color: @surface0;
+  padding: 0.5rem 1rem;
+  margin: 5px 0;
 }
 
 #clock {
   color: @blue;
+  border-radius: 0px 1rem 1rem 0px;
+  margin-right: 1rem;
 }
 
 #battery {
@@ -81,30 +70,33 @@
   color: @yellow;
 }
 
+#backlight, #battery {
+    border-radius: 0;
+}
+
 #pulseaudio {
   color: @maroon;
+  border-radius: 1rem 0px 0px 1rem;
+  margin-left: 1rem;
 }
 
 #custom-music {
   color: @mauve;
+  border-radius: 1rem;
 }
 
 #custom-lock {
-  color: @lavender;
+    border-radius: 1rem 0px 0px 1rem;
+    color: @lavender;
 }
 
 #custom-power {
-  color: @red;
+    margin-right: 1rem;
+    border-radius: 0px 1rem 1rem 0px;
+    color: @red;
 }
 
-#custom-haskell:hover,
-#custom-music:hover,
-#tray:hover,
-#backlight:hover,
-#clock:hover,
-#battery:hover,
-#pulseaudio:hover,
-#custom-lock:hover,
-#custom-power:hover {
-  font-weight: bold;
+#tray {
+  margin-right: 1rem;
+  border-radius: 1rem;
 }