Tweak waybar style and config, change colour order for new bar order, add Hyprland env vars

home/desktop/config/waybar/modules.json

@@ -103,7 +103,7 @@
     },
     "network#compact": {
         "format-wifi": "({signalStrength}%) 󰖩",
-        "format-ethernet": "{ifname} 󰈁",
+        "format-ethernet": "󰈁",
         "tooltip-format": "{essid}",
         "format-linked": "(No IP) 󰈁",
         "format-disconnected": "󰈂"
@@ -151,9 +151,9 @@
         "format": "{name}:{icon}",
         "format-icons": {
             "1": "󰅴",
-            "2": "󰊯",
+            "2": "󰈹",
-            "3": "󰷏",
+            "3": "󰻞",
-            "4": "󰻞",
+            "4": "󰒍",
             "urgent": "",
             "focused": "",
             "default": ""
@@ -173,9 +173,9 @@
         "format": "{name}:{icon}",
         "format-icons": {
             "1": "󰅴",
-            "2": "󰊯",
+            "2": "󰈹",
-            "3": "󰷏",
+            "3": "󰻞",
-            "4": "󰻞",
+            "4": "󰒍",
             "urgent": "",
             "focused": "",
             "default": ""

home/desktop/config/waybar/style.css

@@ -45,16 +45,19 @@ window#waybar.hidden {
     color: @base;
 }
 
+/* left section */
 #workspaces,
 #cpu,
 #memory,
 #temperature,
+/* centre section */
+#clock,
+/* right section */
 #pulseaudio,
 #bluetooth,
 #network,
 #backlight,
 #battery,
-#clock,
 #tray {
     margin-top: 0px;
     margin-bottom: 0px;
@@ -67,16 +70,20 @@ window#waybar.hidden {
     background: @lavender;
 }
 
-#clock {
+#workspaces {
+    background: @lavender;
+}
+
+#cpu {
     background: @pink;
 }
-#cpu {
+#memory {
     background: @mauve;
 }
-#memory {
+#temperature {
     background: @red;
 }
-#temperature {
+#clock {
     background: @yellow;
 }
 #pulseaudio {
@@ -107,9 +114,9 @@ window#waybar.hidden {
     animation-direction: alternate;
 }
 @keyframes blink {
-  to {
+to {
     color: @red;
-  }
+}
 }
 #tray {
     color: @base;

home/desktop/hyprland.nix

@@ -30,6 +30,7 @@ in {
   programs.rofi.package = pkgs.rofi-wayland;
   wayland.windowManager.hyprland = {
     enable = true;
+    package = null; # Use package from nixpkgs
     xwayland = {
       enable = true;
       hidpi = true;
@@ -37,10 +38,16 @@ in {
     extraConfig = lib.mkDefault ''source=./common.conf '';
   };
   xdg.configFile."hypr/common.conf".text = ''
-    monitor=,preferred,auto,auto
+    monitor = ,preferred,auto,auto
-    exec-once = waybar & hyprpaper & dunst & eww daemon
+    exec-once = waybar & hyprpaper & dunst
     source = ./macchiato.conf
 
+    env = XDG_CURRENT_DESKTOP=Hyprland
+    env = XDG_SESSION_TYPE=wayland
+    env = XDG_SESSION_DESKTOP=Hyprland
+    env = GDK_BACKEND=wayland,x11
+    env = GTK_THEME,Sweet-Dark
+    env = XCURSOR_THEME,Catppuccin-Macchiato-Dark-Cursors
     env = XCURSOR_SIZE,24
 
     input {
@@ -99,7 +106,7 @@ in {
     bind = SUPER, Space, exec, rofi -show drun
     bind = SUPER, S, exec, grim -g "$(slurp)"
     bind = SUPER, F1, exec, swaylock
-    bind = SUPER, W, exec, chromium
+    bind = SUPER, W, exec, firefox
     bind = SUPER, F, exec, thunar
     bind = SUPER, M, fullscreen, 1
     bind = SUPER, A, bringactivetotop
@@ -180,15 +187,15 @@ in {
     windowrule = float, ^(pavucontrol)$
     windowrule = float, ^(.blueman-manager-wrapped)$
     windowrule = float, ^(otpclient)$
+    windowrule = float, ^(thunar)$
 
     windowrule = center, ^(foot)$
     windowrule = center, ^(pavucontrol)$
     windowrule = center, ^(.blueman-manager-wrapped)$
     windowrule = move 2% 6%, ^(otpclient)$
 
-    windowrule = workspace 2, ^(chromium-browser)$
+    windowrule = workspace 2, ^(firefox)$
-    windowrule = workspace 3, ^(thunar|libreoffice).*$
+    windowrule = workspace 3 silent, ^(Element|Signal|discord)$
-    windowrule = workspace 4 silent, ^(Element|Signal|discord)$
   '';
   xdg.configFile."hypr/macchiato.conf".text = ''
     $rosewaterAlpha = f4dbd6