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