Add swayosd call for modifier keys

Change master layout rules

Small waybar formatting tweaks

home/hyprland/config.nix

@@ -54,8 +54,8 @@ in ''
 
   master {
     mfact = 0.55
-    new_is_master = true
+    new_is_master = false
-    new_on_top = true
+    new_on_top = false
     no_gaps_when_only = 0
     orientation = left
   }
@@ -121,6 +121,11 @@ in ''
   bind=,Print,exec,watershot
   bind=,XF86Calculator,exec,pkill anyrun || anyrun
 
+  # Bind modifiers to show state using swayosd
+  bindl=,Num_lock,exec,${pkgs.swayosd}/bin/swayosd --num-lock
+  bindl=,Caps_lock,exec,${pkgs.swayosd}/bin/swayosd --caps-lock
+  bindl=,Scroll_lock,exec,${pkgs.swayosd}/bin/swayosd --scroll-lock
+
   # Sound
   bindl=,XF86AudioMute,exec,${pkgs.swayosd}/bin/swayosd --output-volume=mute-toggle
   bindl=,XF86AudioMicMute,exec,${pkgs.swayosd}/bin/swayosd --input-volume=mute-toggle

home/hyprland/waybar/modules/backlight.nix

@@ -1,5 +1,5 @@
 {
-  format = "{icon}";
+  format = "{icon} ";
   tooltip-format = "{percent}%";
-  format-icons = ["" "" "" "" "" "" "" "" ""];
+  format-icons = [ "" "" "" "" "" "" "" "" "" ];
 }

home/hyprland/waybar/modules/battery.compact.nix

@@ -3,9 +3,9 @@
     warning = 30;
     critical = 15;
   };
-  format = "{icon}";
+  format = "{icon} ";
   format-charging = "󰂄";
   format-plugged = "󰚥";
   tooltip-format = "{time} {capacity}%";
-  format-icons = ["󱃍" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹"];
+  format-icons = [ "󱃍" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹" ];
 }

home/hyprland/waybar/modules/pulseaudio.nix

@@ -7,13 +7,13 @@
   format-source = "{volume}% 󰍬";
   format-source-muted = "󰍭";
   format-icons = {
-    headphone = "󰋋";
+    headphone = "󰋋 ";
-    hands-free = "󰥰";
+    hands-free = "󰥰 ";
-    headset = "󰋎";
+    headset = "󰋎 ";
-    phone = "󰏲";
+    phone = "󰏲 ";
-    portable = "󰏳";
+    portable = "󰏳 ";
-    car = "󰄍";
+    car = "󰄍 ";
-    default = ["󰕿" "󰖀" "󰕾"];
+    default = [ "󰕿 " "󰖀 " "󰕾 " ];
   };
   on-click = "pavucontrol";
 }