Merge remote-tracking branch 'origin/nixos' into nixos

modules/programs/hyprland/config.nix

@@ -165,26 +165,26 @@ in
   bind = $mainMod , RETURN , exec , kitty
 
   # XF86 keys
-  bind = , XF86AudioLowerVolume  , exec , pamixer -d 5
-  bind = , XF86AudioRaiseVolume  , exec , pamixer -i 5
+  binde = , XF86AudioLowerVolume  , exec , pamixer -d 5
+  binde = , XF86AudioRaiseVolume  , exec , pamixer -i 5
   bind = , XF86AudioMute         , exec , pamixer -t
   bind = , XF86AudioNext         , exec , playerctl -p "spotifyd,firefox" next
   bind = , XF86AudioPlay         , exec , playerctl -p "spotifyd,firefox" play-pause
   bind = , XF86AudioPrev         , exec , playerctl -p "spotifyd,firefox" previous
-  bind = , XF86MonBrightnessDown , exec , brightnessctl s 10%-
-  bind = , XF86MonBrightnessUp   , exec , brightnessctl s 10%+
+  binde = , XF86MonBrightnessDown , exec , brightnessctl s 10%-
+  binde = , XF86MonBrightnessUp   , exec , brightnessctl s 10%+
 
   # Move focus with mainMod + hjkl
-  bind = $mainMod, H, movefocus, l
-  bind = $mainMod, L, movefocus, r
-  bind = $mainMod, K, movefocus, u
-  bind = $mainMod, J, movefocus, d
+  binde = $mainMod, H, movefocus, l
+  binde = $mainMod, L, movefocus, r
+  binde = $mainMod, K, movefocus, u
+  binde = $mainMod, J, movefocus, d
 
   # Change current active window size with mainMod + SHIFT + hjkl
-  bind = $mainMod SHIFT, H, resizeactive, -10 0
-  bind = $mainMod SHIFT, J, resizeactive, 0 10
-  bind = $mainMod SHIFT, K, resizeactive, 0 -10
-  bind = $mainMod SHIFT, L, resizeactive, 10 0
+  binde = $mainMod SHIFT, H, resizeactive, -10 0
+  binde = $mainMod SHIFT, J, resizeactive, 0 10
+  binde = $mainMod SHIFT, K, resizeactive, 0 -10
+  binde = $mainMod SHIFT, L, resizeactive, 10 0
 
   # Move current active window with mainMod + ALT + hjkl
   bind = $mainMod ALT, H, movewindow, l
@@ -223,6 +223,4 @@ in
   # Move/resize windows with mainMod + LMB/RMB and dragging
   bindm = $mainMod, mouse:272, movewindow
   bindm = $mainMod, mouse:273, resizewindow
-
-  exec-once=randomWallpaper
 ''

modules/programs/hyprland/default.nix

@@ -30,9 +30,12 @@ in
   config = mkIf cfg.enable {
     my = {
       programs = {
+        wallpaper.enable = true;
         kitty.enable = true;
         rofi.enable = true;
+
       };
+      wallpapers.enable = true;
       services.dunst.enable = true;
     };
 
@@ -95,17 +98,32 @@ in
             command = "${getExe pkgs.swaylock} -fF";
           }
         ];
-        timeouts = [
-          {
-            timeout = 300;
-            command = "${hyprland}/bin/hyprctl dispatch dpms off";
-            resumeCommand = "${hyprland}/bin/hyprctl dispatch dpms on";
-          }
-          {
-            timeout = 310;
-            command = "${pkgs.systemd}/bin/loginctl lock-session";
-          }
-        ];
+        timeouts =
+          let
+            lockTimeout = 10;
+          in
+          [
+            {
+              timeout = lockTimeout * 60 - 10;
+              command = "${pkgs.libnotify}/bin/notify-send 'Locking screen!'";
+            }
+            {
+              timeout = lockTimeout * 60;
+              command = "${hyprland}/bin/hyprctl dispatch dpms off";
+              resumeCommand = "${hyprland}/bin/hyprctl dispatch dpms on";
+            }
+            {
+              timeout = lockTimeout * 60 + 10;
+              command = "${pkgs.systemd}/bin/loginctl lock-session";
+            }
+          ] ++ optional
+            (!cfg.nvidiaSupport) # TODO https://github.com/hyprwm/Hyprland/issues/1728
+            [
+              {
+                timeout = 30 * 60;
+                command = "${pkgs.systemd}/bin/systemctl suspend-then-hibernate";
+              }
+            ];
         systemdTarget = "hyprland-session.target";
       };
     };
@@ -127,33 +145,41 @@ in
         };
       in
       {
-        enable = true;
-        partOf = [ "graphical-session.target" ];
         wantedBy = [ "graphical-session.target" ];
-        after = [ "graphical-session.target" ];
         serviceConfig = {
+          ExecStartPre = "${pkgs.coreutils}/bin/sleep 0.5";
           ExecStart = "${getExe pkgs.hyprpaper} -c ${config}";
-          RestartSec = "1s";
+          RestartSec = "500ms";
           Restart = "on-failure";
         };
       };
 
+    systemd.user.services.random-wallpaper = {
+      wantedBy = [ "graphical-session.target" ];
+      requires = [ "hyprpaper.service" ];
+      serviceConfig = {
+        ExecStartPre = "${pkgs.coreutils}/bin/sleep 0.5";
+        ExecStart = "${getExe config.my.programs.wallpaper.package} -r";
+        RestartSec = "500ms";
+        Restart = "on-failure";
+      };
+    };
+
     # only consider graphical-session.target started when hyprland-sesstion.target is reached
     systemd.user.targets.hyprland-session = {
+      partOf = [ "graphical-session.target" ];
       wantedBy = [ "graphical-session.target" ];
       before = [ "graphical-session.target" ];
     };
 
     systemd.user.services.xdg-desktop-portal-hyprland = {
-      after = [ "hyprland-session.target" ];
-      wantedBy = [ "hyprland-session.target" ];
+      after = [ "hyrpland-session.target" ];
+      requiredBy = [ "xdg-desktop-portal.service" ];
     };
 
-    home-manager.users.moritz.systemd.user.services.nextcloud-client = {
-      Service = {
-        RestartSec = "1s";
-        Restart = "on-failure";
-      };
+    home-manager.users.moritz.systemd.user.services.nextcloud-client.Service = {
+      RestartSec = "500ms";
+      Restart = "on-failure";
     };
 
     # add user packages for wayland and hyprland in particular
@@ -214,7 +240,7 @@ in
     security.rtkit.enable = true;
 
 
-    # dekstop portal (for screensharing)
+    # desktop portal (for screensharing)
     xdg.portal = {
       enable = true;
       wlr.enable = mkForce false;