Setup master layout

home-manager/linux/programs/desktop/waybar.nix

@@ -3,7 +3,30 @@ let
   fuzzel-command = config.nathan.config.desktop.fuzzel-command;
   targets = config.nathan.config.desktop.targets;
   hyprland = config.nathan.programs.hyprland.enable;
-in lib.mkIf hyprland {
+in lib.mkMerge [
+  # Hyprland specific configuration
+  (lib.mkIf hyprland {
+    programs.waybar.settings.mainBar = {
+      modules-center = [
+        "custom/launcher"
+        "wlr/workspaces"
+        "custom/media"
+        # "hyprland/window"
+        "idle_inhibitor"
+        "pulseaudio"
+        "network"
+        "cpu"
+        "memory"
+        # "temperature"
+        "tray"
+        "custom/notification"
+        "clock"
+        # "custom/power"
+      ];
+    };
+  })
+  # General configuration
+  (lib.mkIf hyprland {
     #########################
     ## Waybar
     #########################
@@ -24,25 +47,6 @@ in lib.mkIf hyprland {
           spacing = 0;
           margin-top = 5;
           margin-bottom = 0;
-        # modules-left = [ "wlr/workspaces" "hyprland/submap" ];
-        # modules-center = [ "hyprland/window" ];
-        # modules-right = [ "mpd" "clock" "tray" ];
-        modules-center = [
-          "custom/launcher"
-          "wlr/workspaces"
-          "custom/media"
-          # "hyprland/window"
-          "idle_inhibitor"
-          "pulseaudio"
-          "network"
-          "cpu"
-          "memory"
-          # "temperature"
-          "tray"
-          "custom/notification"
-          "clock"
-          # "custom/power"
-        ];
           "custom/launcher" = {
             format = "";
             on-click = fuzzel-command + " --prompt='❯ ' ";
@@ -115,7 +119,8 @@ in lib.mkIf hyprland {
             format-icons = {
               notification = " <span foreground='red'><sup></sup></span> ";
               none = "  ";
-            dnd-notification = " <span foreground='red'><sup></sup></span> ";
+              dnd-notification =
+                " <span foreground='red'><sup></sup></span> ";
               dnd-none = "";
               inhibited-notification =
                 " <span foreground='red'><sup></sup></span> ";
@@ -478,4 +483,5 @@ in lib.mkIf hyprland {
       };
     };
 
-}
+  })
+]

home-manager/linux/programs/hyprland.nix

@@ -86,57 +86,84 @@ in with lib; {
           preserve_split = true # you probably want this
         }
 
+        master {
+          new_is_master = false
+        }
+
         gestures {
           workspace_swipe = false
         }
 
-        $mainMod = SUPER
+        bind = SUPER, Q, exec, alacritty
+        bind = SUPER, C, killactive,
+        # bind = SUPER, M, exit,
+        bind = SUPER, E, exec, dolphin
+        bind = SUPER, V, togglefloating,
+        bind = SUPER, P, pseudo, # dwindle
+        bind = SUPER, B, togglesplit, # dwindle
 
-        bind = $mainMod, Q, exec, alacritty
-        bind = $mainMod, C, killactive,
-        # bind = $mainMod, M, exit,
-        bind = $mainMod, E, exec, dolphin
-        bind = $mainMod, V, togglefloating,
-        bind = $mainMod, P, pseudo, # dwindle
-        bind = $mainMod, B, togglesplit, # dwindle
+        # Maximize
+        bind = SUPER, A, fullscreen, 1
+        bind = SUPER SHIFT, A, fullscreen, 0
 
         # Move focus with mainMod + arrow keys
-        bind = $mainMod, H, movefocus, l
-        bind = $mainMod, L, movefocus, r
-        bind = $mainMod, K, movefocus, u
-        bind = $mainMod, J, movefocus, d
+        bind = SUPER, H, movefocus, l
+        bind = SUPER, L, movefocus, r
+        bind = SUPER, K, movefocus, u
+        bind = SUPER, K, layoutmsg, focusnext
+        bind = SUPER, J, movefocus, d
+        bind = SUPER, J, layoutmsg, focusprev
+
+        # Move windows with mainMod + arrow keys
+        bind = SUPER SHIFT, H, movewindow, l
+        bind = SUPER SHIFT, L, movewindow, r
+        bind = SUPER SHIFT, K, movewindow, u
+        bind = SUPER SHIFT, K, layoutmsg, swapnext
+        bind = SUPER SHIFT, J, movewindow, d
+        bind = SUPER SHIFT, J, layoutmsg, swapprev
+
+        # Switch layouts with a mode
+        bind = SUPER, S, submap, layout
+        submap=layout
+        # dwindle
+        bind = , A, exec, hyprctl keyword general:layout dwindle
+        bind = , A, submap, reset
+        # master
+        bind = , S, exec, hyprctl keyword general:layout master
+        bind = , S, submap, reset
+        submap = reset
 
         # 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
+        bind = SUPER, 1, workspace, 1
+        bind = SUPER, 2, workspace, 2
+        bind = SUPER, 3, workspace, 3
+        bind = SUPER, 4, workspace, 4
+        bind = SUPER, 5, workspace, 5
+        bind = SUPER, 6, workspace, 6
+        bind = SUPER, 7, workspace, 7
+        bind = SUPER, 8, workspace, 8
+        bind = SUPER, 9, workspace, 9
+        bind = SUPER, 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 = SUPER SHIFT, 1, movetoworkspace, 1
+        bind = SUPER SHIFT, 2, movetoworkspace, 2
+        bind = SUPER SHIFT, 3, movetoworkspace, 3
+        bind = SUPER SHIFT, 4, movetoworkspace, 4
+        bind = SUPER SHIFT, 5, movetoworkspace, 5
+        bind = SUPER SHIFT, 6, movetoworkspace, 6
+        bind = SUPER SHIFT, 7, movetoworkspace, 7
+        bind = SUPER SHIFT, 8, movetoworkspace, 8
+        bind = SUPER SHIFT, 9, movetoworkspace, 9
+        bind = SUPER SHIFT, 0, movetoworkspace, 10
 
         # Scroll through existing workspaces with mainMod + scroll
-        bind = $mainMod, mouse_down, workspace, e+1
-        bind = $mainMod, mouse_up, workspace, e-1
+        bind = SUPER, mouse_down, workspace, e+1
+        bind = SUPER, mouse_up, workspace, e-1
 
         # Move/resize windows with mainMod + LMB/RMB and dragging
-        bindm = $mainMod, mouse:272, movewindow
-        bindm = $mainMod, mouse:273, resizewindow
+        bindm = SUPER, mouse:272, movewindow
+        bindm = SUPER, mouse:273, resizewindow
 
         # Media key binds
         bind = , xf86audioraisevolume, exec, swayosd --output-volume=raise
@@ -169,6 +196,35 @@ in with lib; {
         windowrulev2 = float,class:^(.blueman-manager-wrapped)$
         windowrulev2 = center,class:^(.blueman-manager-wrapped)$
 
+        # firefox Picture-in-Picture
+        windowrulev2 = float,class:^(firefox)$,title:^(Picture-in-Picture)$
+        windowrulev2 = pin,class:^(firefox)$,title:^(Picture-in-Picture)$
+        windowrulev2 = nofullscreenrequest,class:^(firefox)$,title:^(Picture-in-Picture)$
+
+        # firefox figma micro indicator
+        windowrulev2 = nofullscreenrequest,class:^(firefox)$,title:^(Firefox — Sharing Indicator)$
+        windowrulev2 = float,class:^(firefox)$,title:^(Firefox — Sharing Indicator)$
+
+        # Common modals
+        windowrule = float,title:^(Open)$
+        windowrule = center,title:^(Open)$
+        windowrule = float,title:^(Choose Files)$
+        windowrule = center,title:^(Choose Files)$
+        windowrule = float,title:^(Save As)$
+        windowrule = center,title:^(Save As)$
+        windowrule = float,title:^(Confirm to replace files)$
+        windowrule = center,title:^(Confirm to replace files)$
+        windowrule = float,title:^(File Operation Progress)$
+        windowrule = center,title:^(File Operation Progress)$
+        windowrulev2 = float,class:^(google-chrome)$,title:^(Open Files)$
+        windowrulev2 = center,class:^(google-chrome)$,title:^(Open Files)$
+        windowrulev2 = float,class:^(google-chrome)$,title:^(Open File)$
+        windowrulev2 = center,class:^(google-chrome)$,title:^(Open File)$
+
+        # Pavucontrol
+        windowrule = center,pavucontrol
+        windowrule = float,pavucontrol
+
         ## Scratchpads
 
         # Alacritty

machines/levitation/home.nix

@@ -26,8 +26,12 @@
       sensitivity = -0.8
       # accel_profile = flat
     }
+    master {
+      mfact = 0.68
+    }
     exec-once=hyprpaper
   '';
+  ################################################################################
 
   # Background
   xdg.configFile."hypr/hyprpaper.conf" = {