home/programs/graphical/games/lutris.nix

@@ -10,14 +10,10 @@
 in {
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
-      (lutris.override {
+      lutris.override
-        extraLibraries = pkgs: [
+      {
-          pixman
+        extraPkgs = pkgs: [];
-        ];
+      }
-        extraPkgs = pkgs: [
-          jdk
-        ];
-      })
     ];
   };
 }

home/programs/terminal/editors/neovim/default.nix

@@ -31,8 +31,7 @@
       neocmakelsp
       bash-language-server
       nixd
-      emmet-language-server
+      emmet-ls
-      vscode-langservers-extracted
 
       # Linters / formatters
       stylua
@@ -43,7 +42,6 @@
       hadolint
       markdownlint-cli2
       nodePackages.prettier
-      nodePackages.eslint
       shellcheck
       shfmt
       alejandra

home/services/hypridle.nix

@@ -47,7 +47,7 @@ in {
           # Enter suspend/sleep state (10 minutes)
           {
             timeout = 600;
-            on-timeout = "systemctl suspend";
+            on-timeout = "systemctl suspend-then-hibernate";
           }
         ];
       };

system/roles/workstation/programs/physlock.nix

@@ -14,13 +14,11 @@ in {
       enable = true;
       lockMessage = "System is locked...";
 
+      # Don't auto-lock the system with physlock, I prefer other (gui) lockers
       # I only use physlock manually in some circumstances
       lockOn = {
-        # Don't auto-lock the system with physlock on suspend, I prefer other (gui) lockers
         suspend = false;
-        # Do use physlock on resuming from hibernation though, as this just restored RAM,
+        hibernate = false;
-        # potentially bypassing the login screen and even initial disk encryption password
-        hibernate = true;
       };
     };
   };

system/roles/workstation/services/logind.nix

@@ -11,10 +11,10 @@ in {
     # despite being under logind, this has nothing to do with login
     # it's about power management
     services.logind = {
-      lidSwitch = "suspend";
+      lidSwitch = "suspend-then-hibernate";
       lidSwitchExternalPower = "suspend";
       extraConfig = ''
-        HandlePowerKey=suspend
+        HandlePowerKey=suspend-then-hibernate
         HibernateDelaySec=3600
       '';
     };