Extract a gnupg mixin

hosts/PW05CH3L/configuration.nix

@@ -3,7 +3,7 @@
 {
   imports = [
     ../../modules/editor/nvim.nix
-    ../../modules/mixins/common
+    ../../modules/mixins/common.nix
     ../../modules/mixins/direnv.nix
     ../../modules/mixins/docker.nix
     ../../modules/mixins/fzf.nix

hosts/lemp11/configuration.nix

@@ -7,7 +7,7 @@
     ./programs.nix
     ./services.nix
 
-    ../../modules/mixins/common
+    ../../modules/mixins/common.nix
     ../../modules/mixins/zsh
 
     ../../users/opdavies

hosts/nixedo/configuration.nix

@@ -10,7 +10,7 @@
     ./secrets.nix
     ./services.nix
 
-    ../../modules/mixins/common
+    ../../modules/mixins/common.nix
     ../../modules/mixins/docker.nix
     ../../modules/mixins/zsh
 

hosts/t480/configuration.nix

@@ -9,7 +9,7 @@
 
     ../../modules/editor/nvim.nix
     ../../modules/mixins/bluetooth.nix
-    ../../modules/mixins/common
+    ../../modules/mixins/common.nix
     ../../modules/mixins/direnv.nix
     ../../modules/mixins/docker.nix
     ../../modules/mixins/firefox.nix
@@ -17,6 +17,7 @@
     ../../modules/mixins/fonts.nix
     ../../modules/mixins/fzf.nix
     ../../modules/mixins/git.nix
+    ../../modules/mixins/gnupg.nix
     ../../modules/mixins/gtk.nix
     ../../modules/mixins/qutebrowser.nix
     ../../modules/mixins/mpv.nix

hosts/t490/configuration.nix

@@ -9,7 +9,7 @@
     ./services
     ./users.nix
 
-    ../../modules/mixins/common
+    ../../modules/mixins/common.nix
 
     ../../users/opdavies
   ];

modules/mixins/common.nix

@@ -13,8 +13,6 @@
 {
   imports = [
     inputs.home-manager.nixosModules.home-manager
-
-    ./programs.nix
   ];
 
   nix = {
@@ -32,6 +30,8 @@
     };
   };
 
+  programs.zsh.enable = true;
+
   users.defaultUserShell = pkgs.zsh;
 
   environment.systemPackages = with pkgs; [

modules/mixins/gnupg.nix

@@ -7,10 +7,5 @@
       enableSSHSupport = true;
       pinentryPackage = pkgs.pinentry-qt;
     };
-
-    zsh = {
-      enable = true;
-      histSize = 5000;
-    };
   };
 }