diff --git a/home/programs/graphical/games/lutris.nix b/home/programs/graphical/games/lutris.nix
index 5c3ba51..36547a3 100644
--- a/home/programs/graphical/games/lutris.nix
+++ b/home/programs/graphical/games/lutris.nix
@@ -10,14 +10,10 @@
 in {
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
-      (lutris.override {
-        extraLibraries = pkgs: [
-          pixman
-        ];
-        extraPkgs = pkgs: [
-          jdk
-        ];
-      })
+      lutris.override
+      {
+        extraPkgs = pkgs: [];
+      }
     ];
   };
 }
diff --git a/home/programs/terminal/editors/neovim/default.nix b/home/programs/terminal/editors/neovim/default.nix
index 992d3b1..a8459a0 100644
--- a/home/programs/terminal/editors/neovim/default.nix
+++ b/home/programs/terminal/editors/neovim/default.nix
@@ -31,8 +31,7 @@
       neocmakelsp
       bash-language-server
       nixd
-      emmet-language-server
-      vscode-langservers-extracted
+      emmet-ls
 
       # Linters / formatters
       stylua
@@ -43,7 +42,6 @@
       hadolint
       markdownlint-cli2
       nodePackages.prettier
-      nodePackages.eslint
       shellcheck
       shfmt
       alejandra
diff --git a/home/services/hypridle.nix b/home/services/hypridle.nix
index e1d0dff..3353ec4 100644
--- a/home/services/hypridle.nix
+++ b/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";
           }
         ];
       };
diff --git a/system/roles/workstation/programs/physlock.nix b/system/roles/workstation/programs/physlock.nix
index a853a18..00f3c6d 100644
--- a/system/roles/workstation/programs/physlock.nix
+++ b/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,
-        # potentially bypassing the login screen and even initial disk encryption password
-        hibernate = true;
+        hibernate = false;
       };
     };
   };
diff --git a/system/roles/workstation/services/logind.nix b/system/roles/workstation/services/logind.nix
index 28a598b..2c20494 100644
--- a/system/roles/workstation/services/logind.nix
+++ b/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
       '';
     };