refactor(treewide): Update to new modules names (and simplify some code)

1 files changed, 7 insertions, 14 deletions

diff --git a/hm/soispha/conf/gpg/default.nix b/hm/soispha/conf/gpg/default.nix
index d0cc33a2..60c2ef2a 100644
--- a/hm/soispha/conf/gpg/default.nix
+++ b/hm/soispha/conf/gpg/default.nix
@@ -13,6 +13,7 @@
       onlykey-agent
     ];
   };
+
   settings =
     if nixosConfig.networking.hostName == "isimud"
     then {}
@@ -23,20 +24,12 @@
       default-key = "Soispha <soispha@vhack.eu>";
       # TODO: add more
     };
-  gpg-agent =
-    if nixosConfig.networking.hostName == "isimud"
-    then {
-      enable = true;
-      enableZshIntegration = true;
-      enableScDaemon = true; # smartcards and such things
-      pinentryFlavor = "tty";
-    }
-    else {
-      enable = false;
-      enableZshIntegration = true;
-      enableScDaemon = true; # smartcards and such things
-      pinentryFlavor = "tty";
-    };
+  gpg-agent = {
+    enable = nixosConfig.networking.hostName == "isimud";
+    enableZshIntegration = true;
+    enableScDaemon = true; # smartcards and such things
+    pinentryPackage = pkgs.pinentry-tty;
+  };
 in {
   programs.gpg = {
     enable = true;