diff --git a/home/features/cli/default.nix b/home/features/cli/default.nix
index d653e40..f5338f2 100644
--- a/home/features/cli/default.nix
+++ b/home/features/cli/default.nix
@@ -3,6 +3,7 @@
     ./exa.nix
     ./bat.nix
     ./ssh.nix
+    ./gpg.nix
     ./git.nix
     ./starship.nix
     ./direnv.nix
diff --git a/home/features/cli/gpg.nix b/home/features/cli/gpg.nix
index 677c39d..35706a1 100644
--- a/home/features/cli/gpg.nix
+++ b/home/features/cli/gpg.nix
@@ -12,19 +12,10 @@ in
 {
   home.packages = pinentry.packages;
 
-  # TODO: consider ssh support
   services.gpg-agent = {
     enable = true;
     pinentryFlavor = pinentry.name;
   };
 
-  programs.gpg = {
-    enable = true;
-    settings = {
-      trust-model = "tofu+pgp";
-    };
-    # publicKeys = [{
-    #   trust = 5;
-    # }];
-  };
+  programs.gpg.enable = true;
 }