From 7486b5259adff55b6637248e3c49a26a8f9b9ca5 Mon Sep 17 00:00:00 2001 From: ItsDrike Date: Thu, 12 Sep 2024 22:56:56 +0200 Subject: [PATCH 1/6] Move to emmet-language-server (from emmet-ls) --- home/programs/terminal/editors/neovim/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/programs/terminal/editors/neovim/default.nix b/home/programs/terminal/editors/neovim/default.nix index a8459a0..e3dfe78 100644 --- a/home/programs/terminal/editors/neovim/default.nix +++ b/home/programs/terminal/editors/neovim/default.nix @@ -31,7 +31,7 @@ neocmakelsp bash-language-server nixd - emmet-ls + emmet-language-server # Linters / formatters stylua From fdf5b7bace8fcea1f44635e91e8f2ec18aaa64e3 Mon Sep 17 00:00:00 2001 From: ItsDrike Date: Fri, 13 Sep 2024 21:18:43 +0200 Subject: [PATCH 2/6] Don't hibernate by default --- home/services/hypridle.nix | 2 +- system/roles/workstation/services/logind.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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/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 ''; }; From 138613dc117af5f8e645164ae6cd07189e32e6d0 Mon Sep 17 00:00:00 2001 From: ItsDrike Date: Fri, 13 Sep 2024 21:20:25 +0200 Subject: [PATCH 3/6] Enable physlock on resume from hibernation --- system/roles/workstation/programs/physlock.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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; }; }; }; From e6e366fd6c2485325fb76b928a1f77e9c19a39dd Mon Sep 17 00:00:00 2001 From: ItsDrike Date: Tue, 17 Sep 2024 02:24:39 +0200 Subject: [PATCH 4/6] Add eslint to nvim packages --- home/programs/terminal/editors/neovim/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/programs/terminal/editors/neovim/default.nix b/home/programs/terminal/editors/neovim/default.nix index e3dfe78..dc6fa1c 100644 --- a/home/programs/terminal/editors/neovim/default.nix +++ b/home/programs/terminal/editors/neovim/default.nix @@ -32,6 +32,7 @@ bash-language-server nixd emmet-language-server + nodePackages.eslint # Linters / formatters stylua From 7eaa7d00944309613009be66c26f4ed6cdd75ca5 Mon Sep 17 00:00:00 2001 From: ItsDrike Date: Tue, 17 Sep 2024 02:27:04 +0200 Subject: [PATCH 5/6] Add vscode-lanservers-extracted pkg to nvim --- home/programs/terminal/editors/neovim/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home/programs/terminal/editors/neovim/default.nix b/home/programs/terminal/editors/neovim/default.nix index dc6fa1c..992d3b1 100644 --- a/home/programs/terminal/editors/neovim/default.nix +++ b/home/programs/terminal/editors/neovim/default.nix @@ -32,7 +32,7 @@ bash-language-server nixd emmet-language-server - nodePackages.eslint + vscode-langservers-extracted # Linters / formatters stylua @@ -43,6 +43,7 @@ hadolint markdownlint-cli2 nodePackages.prettier + nodePackages.eslint shellcheck shfmt alejandra From e8307d3054e4c135c8d426eaa75f74f53fab7762 Mon Sep 17 00:00:00 2001 From: ItsDrike Date: Tue, 17 Sep 2024 02:27:11 +0200 Subject: [PATCH 6/6] Add jdk package to lutris --- home/programs/graphical/games/lutris.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) 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 + ]; + }) ]; }; }