random rice

home-manager/shared/wayland/default.nix

@@ -7,66 +7,76 @@
     ./alacritty
     ./hyprland
   ];
-
-  home.packages = with pkgs; [
-    pulseaudio
-    pulsemixer
-    alsa-utils
-    wlogout
-    wf-recorder
-    wdisplays
-    wl-clipboard
-    gammastep
-    sway-contrib.grimshot
-    xdg-utils
-  ];
-  home.sessionVariables = {
-    MOZ_DBUS_REMOTE = 1;
+  home = {
+    packages = with pkgs; [
+      pulseaudio
+      pulsemixer
+      alsa-utils
+      wlogout
+      wf-recorder
+      wdisplays
+      wl-clipboard
+      gammastep
+      sway-contrib.grimshot
+      xdg-utils
+    ];
+    sessionVariables = {
+      MOZ_DBUS_REMOTE = 1;
+    };
+    file.".icons/default".source = "${pkgs.vanilla-dmz}/share/icons/DMZ-Black";
   };
-  programs.wofi = {
-    enable = true;
-    style = ''
-      window, #input, #entry, #scroll, #text, #inner-box {
-        background-color: #152528;
-        color: #e6eaea;
-      }
-      #entry:selected, #text:selected {
-        background-color: #a1cdd8;
-        color: #152528;
-      }
-    '';
-  };
-  services.gammastep = {
-    enable = true;
-    dawnTime = "6:00-8:00";
-    duskTime = "20:00-22:00";
-    latitude = 43.0;
-    longitude = -89.0;
-    temperature.day = 6000;
-    temperature.night = 3500;
-  };
-  programs.swaylock = {
-    enable = true;
-    package = pkgs.swaylock-effects;
-    settings = {
-      color = "#152528";
-      daemonize = true;
-      clock = true;
-      ignore-empty-password = true;
+  services = {
+    gammastep = {
+      enable = true;
+      dawnTime = "6:00-8:00";
+      duskTime = "20:00-22:00";
+      latitude = 43.0;
+      longitude = -89.0;
+      temperature.day = 6000;
+      temperature.night = 3500;
+    };
+    swayidle = {
+      enable = true;
+      events = [
+        {
+          event = "before-sleep";
+          command = "${config.programs.swaylock.package}/bin/swaylock";
+        }
+        {
+          event = "lock";
+          command = "${config.programs.swaylock.package}/bin/swaylock";
+        }
+      ];
+    };
+    mako.enable = true;
+    mako.settings = {
+      default-timeout = 5;
     };
   };
-  services.swayidle = {
-    enable = true;
-    events = [
-      {
-        event = "before-sleep";
-        command = "${config.programs.swaylock.package}/bin/swaylock";
-      }
-      {
-        event = "lock";
-        command = "${config.programs.swaylock.package}/bin/swaylock";
-      }
-    ];
+  programs = {
+    wofi = {
+      enable = true;
+      style = ''
+        window, #input, #entry, #scroll, #text, #inner-box {
+          background-color: #152528;
+          color: #e6eaea;
+        }
+        #entry:selected, #text:selected {
+          background-color: #a1cdd8;
+          color: #152528;
+        }
+      '';
+    };
+    swaylock = {
+      enable = true;
+      package = pkgs.swaylock-effects;
+      settings = {
+        color = "#152528";
+        daemonize = true;
+        clock = true;
+        ignore-empty-password = true;
+      };
+    };
   };
   xdg = {
     configFile."mimeapps.list".force = true;
@@ -92,6 +102,4 @@
       };
     };
   };
-  services.mako.enable = true;
-  home.file.".icons/default".source = "${pkgs.vanilla-dmz}/share/icons/DMZ-Black";
 }

home-manager/shared/wayland/hyprland/default.nix

@@ -91,7 +91,7 @@
           ",XF86AudioMute, exec,  pactl set-sink-mute @DEFAULT_SINK@ toggle"
 
           ## Movement
-          "$mod, p, layoutmsg, swapwithmaster"
+          "$mod, m, layoutmsg, swapwithmaster"
           "$mod, e, layoutmsg, orientationnext"
           "$mod, i, layoutmsg, addmaster"
           "$mod, d, layoutmsg, removemaster"
@@ -100,6 +100,7 @@
           "$mod, k, movefocus, u"
           "$mod, j, movefocus, d"
           "$mod, n, changegroupactive, f"
+          "$mod, p, changegroupactive, b"
           "$mod SHIFT, h, movewindoworgroup, l"
           "$mod SHIFT, l, movewindoworgroup, r"
           "$mod SHIFT, k, movewindoworgroup, u"