2025-02-17

1 files changed, 10 insertions, 11 deletions

diff --git a/modules/gnupg.nix b/modules/gnupg.nix
index 69a10e3..53e72a7 100644
--- a/modules/gnupg.nix
+++ b/modules/gnupg.nix
@@ -4,21 +4,20 @@
   pkgs,
   ...
 }:
-with lib;
 let
   cfg = config.nixfiles.modules.gnupg;
 in
 {
   options.nixfiles.modules.gnupg = {
-    enable = mkEnableOption "GnuPG";
-    pinentry = mkOption {
+    enable = lib.mkEnableOption "GnuPG";
+    pinentry = lib.mkOption {
       description = "Name of a pinentry implementation.";
-      type = types.package;
+      type = lib.types.package;
       default = pkgs.pinentry-curses;
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     hm = {
       programs.gpg = {
         enable = true;
@@ -66,7 +65,7 @@ in
                 "Uncompressed"
               ];
 
-              cs = concatStringsSep " ";
+              cs = lib.concatStringsSep " ";
             in
             {
               default-preference-list = cs (cipherAlgos ++ digestAlgos ++ compressionAlgos);
@@ -75,11 +74,11 @@ in
               personal-digest-preferences = cs digestAlgos;
               personal-compress-preferences = cs compressionAlgos;
 
-              s2k-cipher-algo = head cipherAlgos;
-              s2k-digest-algo = head digestAlgos;
+              s2k-cipher-algo = lib.head cipherAlgos;
+              s2k-digest-algo = lib.head digestAlgos;
 
-              digest-algo = head digestAlgos;
-              cert-digest-algo = head digestAlgos;
+              digest-algo = lib.head digestAlgos;
+              cert-digest-algo = lib.head digestAlgos;
             }
           );
       };
@@ -97,7 +96,7 @@ in
 
         grabKeyboardAndMouse = true;
 
-        sshKeys = [ my.pgp.grip ];
+        sshKeys = [ lib.my.pgp.grip ];
 
         pinentryPackage = cfg.pinentry;
       };