diff options
| author | Alan Pearce | 2024-06-05 14:22:28 +0200 |
|---|---|---|
| committer | Alan Pearce | 2024-06-05 14:22:28 +0200 |
| commit | 41aa7cc366d2242c0dbf1e035f22e7118e2ca942 (patch) | |
| tree | d3ff8dbcd7a4bd51f1cd6c89e6c3b13d5310c119 /system | |
| parent | cd49be6796ebf629bb7de3590b30f08824ce70b8 (diff) | |
| download | nixfiles-41aa7cc366d2242c0dbf1e035f22e7118e2ca942.tar.lz nixfiles-41aa7cc366d2242c0dbf1e035f22e7118e2ca942.tar.zst nixfiles-41aa7cc366d2242c0dbf1e035f22e7118e2ca942.zip | |
overhaul gnupg/trezor setup
Diffstat (limited to 'system')
| -rw-r--r-- | system/prefect.nix | 2 | ||||
| -rw-r--r-- | system/settings/hardware/trezor.nix | 6 | ||||
| -rw-r--r-- | system/settings/programs/gnupg.nix | 12 |
3 files changed, 1 insertions, 19 deletions
diff --git a/system/prefect.nix b/system/prefect.nix index 1ee93fc1..8d90948d 100644 --- a/system/prefect.nix +++ b/system/prefect.nix @@ -15,11 +15,11 @@ ./settings/hardware/nvidia-gpu.nix ./settings/hardware/keyboard.nix ./settings/hardware/keyboard-lofree.nix + ./settings/hardware/trezor.nix ./settings/services/syncthing.nix ./settings/services/virtualisation.nix ./settings/user-interface.nix ./settings/programs/base.nix - ./settings/programs/gnupg.nix ./settings/programs/kde.nix ./settings/programs/shell.nix ./settings/programs/docker.nix diff --git a/system/settings/hardware/trezor.nix b/system/settings/hardware/trezor.nix index 1004833a..3883d76f 100644 --- a/system/settings/hardware/trezor.nix +++ b/system/settings/hardware/trezor.nix @@ -5,13 +5,7 @@ }: { services.trezord.enable = true; environment.systemPackages = with pkgs; [ - gnupg - pinentry (python3.withPackages (ps: with ps; [ trezor_agent wheel ])) trezor-suite ]; - programs.gnupg.agent = { - enable = lib.mkForce false; - enableSSHSupport = lib.mkForce false; - }; } diff --git a/system/settings/programs/gnupg.nix b/system/settings/programs/gnupg.nix deleted file mode 100644 index f17263c9..00000000 --- a/system/settings/programs/gnupg.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ config -, pkgs -, lib -, ... -}: { - environment.systemPackages = with pkgs; [ - gnupg - pinentry - (python3.withPackages (ps: with ps; [ trezor_agent wheel ])) - ]; - environment.variables.GNUPGHOME = "$HOME/.gnupg/trezor/"; -} |