Time and lid based autolocking

flake.nix

@@ -58,14 +58,20 @@
         };
 
       # configure pkgs
-      pkgs = import nixpkgs-patched {
+      # use nixpkgs if running a server (homelab or worklab profile)
-        system = systemSettings.system;
+      # otherwise use patched nixos-unstable nixpkgs
-        config = {
+      pkgs = (if ((systemSettings.profile == "homelab") || (systemSettings.profile == "worklab"))
-          allowUnfree = true;
+              then
-          allowUnfreePredicate = (_: true);
+                pkgs-stable
-        };
+              else
-        overlays = [ rust-overlay.overlays.default ];
+                (import nixpkgs-patched {
-      };
+                  system = systemSettings.system;
+                  config = {
+                    allowUnfree = true;
+                    allowUnfreePredicate = (_: true);
+                  };
+                  overlays = [ rust-overlay.overlays.default ];
+                }));
 
       pkgs-stable = import nixpkgs-stable {
         system = systemSettings.system;
@@ -84,7 +90,13 @@
       };
 
       # configure lib
-      lib = nixpkgs.lib;
+      # use nixpkgs if running a server (homelab or worklab profile)
+      # otherwise use patched nixos-unstable nixpkgs
+      lib = (if ((systemSettings.profile == "homelab") || (systemSettings.profile == "worklab"))
+             then
+               nixpkgs-stable.lib
+             else
+               nixpkgs.lib);
 
       # Systems that can run tests:
       supportedSystems = [ "aarch64-linux" "i686-linux" "x86_64-linux" ];

user/wm/hyprland/hyprland.nix

@@ -42,6 +42,7 @@
       exec-once = emacs --daemon
 
       exec-once = hypridle
+      #exec-once = hyprdim # currently broken :(
       exec-once = obs-notification-mute-daemon
 
       exec = ~/.swaybg-stylix
@@ -137,7 +138,8 @@
        bind=SUPER,C,exec,wl-copy $(hyprpicker)
 
        bind=SUPERSHIFT,S,exec,systemctl suspend
-       bind=SUPERCTRL,L,exec,hyprlock
+       bindl=,switch:on:Lid Switch,exec,loginctl lock-session
+       bind=SUPERCTRL,L,exec,loginctl lock-session
 
        bind=SUPER,H,movefocus,l
        bind=SUPER,J,movefocus,d
@@ -293,6 +295,7 @@
     hypridle
     hyprlock
     hyprnome
+    hyprdim
     swaybg
     fnott
     fuzzel
@@ -386,9 +389,13 @@
     }
 
     listener {
-      timeout = 600 # in seconds
+      timeout = 300 # in seconds
       on-timeout = loginctl lock-session
     }
+    listener {
+      timeout = 600 # in seconds
+      on-timeout = systemctl suspend
+    }
   '';
   home.file.".config/hypr/hyprlock.conf".text = ''
     background {