From df17630c7e18f846370e2595472513f1b52bf99c Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 12 Sep 2024 19:56:53 +0200
Subject: ...
---
accounts/gkleen@sif/hyprland.nix | 2 +-
overlays/worktime/default.nix | 2 ++
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 {
# "$mainMod, J, togglesplit,"
"$mainMod SHIFT, L, exec, loginctl lock-session"
- "$mainMod SHIFT, S, exec, systemctl suspend"
"$mainMod SHIFT, E, exit"
"$mainMod, left, movefocus, l"
@@ -341,6 +340,7 @@ in {
bindl = [
", XF86AudioMute, exec, volumectl -d toggle-mute"
", XF86AudioMicMute, exec, volumectl -d -m toggle-mute"
+ "$mainMod SHIFT, S, exec, systemctl suspend"
", switch:off:Lid Switch,exec,hyprctl dispatch dpms on eDP-1"
", 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;
python = prev.python310;
projectDir = cleanPythonSources { src = ./.; };
+
+ meta.mainProgram = "worktime";
};
}
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 @@
-{ pkgs, config, ...}:
+{ lib, pkgs, config, ...}:
let
moduleList = builtins.fromJSON (builtins.readFile (pkgs.runCommandCC "crypto-modules" { buildInputs = with pkgs; [ jq ]; } ''
echo "[]" > $out
@@ -12,6 +12,13 @@ let
''));
in {
boot.initrd.luks.cryptoModules = moduleList ++ [
- "encrypted_keys" "rng"
+ "encrypted_keys" "trusted" "rng"
+ ];
+ boot.kernelPatches = [
+ {
+ name = "encrypted_key";
+ patch = null;
+ extraStructuredConfig.ENCRYPTED_KEYS = lib.kernel.yes;
+ }
];
}
--
cgit v1.2.3