diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2024-09-12 19:56:53 +0200 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2024-09-12 19:56:53 +0200 |
commit | df17630c7e18f846370e2595472513f1b52bf99c (patch) | |
tree | 4c5f8e0e6ffd1a19bfec156ec90c97a7db2a46e2 | |
parent | 211c680cb30b635cb7b8a54bc4471ac567432a3a (diff) | |
download | nixos-df17630c7e18f846370e2595472513f1b52bf99c.tar nixos-df17630c7e18f846370e2595472513f1b52bf99c.tar.gz nixos-df17630c7e18f846370e2595472513f1b52bf99c.tar.bz2 nixos-df17630c7e18f846370e2595472513f1b52bf99c.tar.xz nixos-df17630c7e18f846370e2595472513f1b52bf99c.zip |
...
-rw-r--r-- | accounts/gkleen@sif/hyprland.nix | 2 | ||||
-rw-r--r-- | overlays/worktime/default.nix | 2 | ||||
-rw-r--r-- | system-profiles/initrd-all-crypto-modules.nix | 11 |
3 files changed, 12 insertions, 3 deletions
diff --git a/accounts/gkleen@sif/hyprland.nix b/accounts/gkleen@sif/hyprland.nix index 17385a06..c5043e87 100644 --- a/accounts/gkleen@sif/hyprland.nix +++ b/accounts/gkleen@sif/hyprland.nix | |||
@@ -133,7 +133,6 @@ in { | |||
133 | # "$mainMod, J, togglesplit," | 133 | # "$mainMod, J, togglesplit," |
134 | 134 | ||
135 | "$mainMod SHIFT, L, exec, loginctl lock-session" | 135 | "$mainMod SHIFT, L, exec, loginctl lock-session" |
136 | "$mainMod SHIFT, S, exec, systemctl suspend" | ||
137 | "$mainMod SHIFT, E, exit" | 136 | "$mainMod SHIFT, E, exit" |
138 | 137 | ||
139 | "$mainMod, left, movefocus, l" | 138 | "$mainMod, left, movefocus, l" |
@@ -341,6 +340,7 @@ in { | |||
341 | bindl = [ | 340 | bindl = [ |
342 | ", XF86AudioMute, exec, volumectl -d toggle-mute" | 341 | ", XF86AudioMute, exec, volumectl -d toggle-mute" |
343 | ", XF86AudioMicMute, exec, volumectl -d -m toggle-mute" | 342 | ", XF86AudioMicMute, exec, volumectl -d -m toggle-mute" |
343 | "$mainMod SHIFT, S, exec, systemctl suspend" | ||
344 | 344 | ||
345 | ", switch:off:Lid Switch,exec,hyprctl dispatch dpms on eDP-1" | 345 | ", switch:off:Lid Switch,exec,hyprctl dispatch dpms on eDP-1" |
346 | ", switch:on:Lid Switch,exec,hyprctl dispatch dpms off eDP-1" | 346 | ", switch:on:Lid Switch,exec,hyprctl dispatch dpms off eDP-1" |
diff --git a/overlays/worktime/default.nix b/overlays/worktime/default.nix index a06ed6e0..5ecdf149 100644 --- a/overlays/worktime/default.nix +++ b/overlays/worktime/default.nix | |||
@@ -7,5 +7,7 @@ with prev.poetry2nix; | |||
7 | python = prev.python310; | 7 | python = prev.python310; |
8 | 8 | ||
9 | projectDir = cleanPythonSources { src = ./.; }; | 9 | projectDir = cleanPythonSources { src = ./.; }; |
10 | |||
11 | meta.mainProgram = "worktime"; | ||
10 | }; | 12 | }; |
11 | } | 13 | } |
diff --git a/system-profiles/initrd-all-crypto-modules.nix b/system-profiles/initrd-all-crypto-modules.nix index 3b3b24fc..45cd4b74 100644 --- a/system-profiles/initrd-all-crypto-modules.nix +++ b/system-profiles/initrd-all-crypto-modules.nix | |||
@@ -1,4 +1,4 @@ | |||
1 | { pkgs, config, ...}: | 1 | { lib, pkgs, config, ...}: |
2 | let | 2 | let |
3 | moduleList = builtins.fromJSON (builtins.readFile (pkgs.runCommandCC "crypto-modules" { buildInputs = with pkgs; [ jq ]; } '' | 3 | moduleList = builtins.fromJSON (builtins.readFile (pkgs.runCommandCC "crypto-modules" { buildInputs = with pkgs; [ jq ]; } '' |
4 | echo "[]" > $out | 4 | echo "[]" > $out |
@@ -12,6 +12,13 @@ let | |||
12 | '')); | 12 | '')); |
13 | in { | 13 | in { |
14 | boot.initrd.luks.cryptoModules = moduleList ++ [ | 14 | boot.initrd.luks.cryptoModules = moduleList ++ [ |
15 | "encrypted_keys" "rng" | 15 | "encrypted_keys" "trusted" "rng" |
16 | ]; | ||
17 | boot.kernelPatches = [ | ||
18 | { | ||
19 | name = "encrypted_key"; | ||
20 | patch = null; | ||
21 | extraStructuredConfig.ENCRYPTED_KEYS = lib.kernel.yes; | ||
22 | } | ||
16 | ]; | 23 | ]; |
17 | } | 24 | } |