From 4bbca3493e90c67ff2948c1823bea24346ef59be Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Sun, 6 Apr 2025 00:45:11 +0100
Subject: [PATCH] Extract a gnupg mixin

---
 hosts/PW05CH3L/configuration.nix                  | 2 +-
 hosts/lemp11/configuration.nix                    | 2 +-
 hosts/nixedo/configuration.nix                    | 2 +-
 hosts/t480/configuration.nix                      | 3 ++-
 hosts/t490/configuration.nix                      | 2 +-
 modules/mixins/{common/default.nix => common.nix} | 4 ++--
 modules/mixins/{common/programs.nix => gnupg.nix} | 5 -----
 7 files changed, 8 insertions(+), 12 deletions(-)
 rename modules/mixins/{common/default.nix => common.nix} (98%)
 rename modules/mixins/{common/programs.nix => gnupg.nix} (71%)

diff --git a/hosts/PW05CH3L/configuration.nix b/hosts/PW05CH3L/configuration.nix
index 2394eea4..5af1193f 100644
--- a/hosts/PW05CH3L/configuration.nix
+++ b/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
diff --git a/hosts/lemp11/configuration.nix b/hosts/lemp11/configuration.nix
index 6af2a7c6..d4f214d4 100644
--- a/hosts/lemp11/configuration.nix
+++ b/hosts/lemp11/configuration.nix
@@ -7,7 +7,7 @@
     ./programs.nix
     ./services.nix
 
-    ../../modules/mixins/common
+    ../../modules/mixins/common.nix
     ../../modules/mixins/zsh
 
     ../../users/opdavies
diff --git a/hosts/nixedo/configuration.nix b/hosts/nixedo/configuration.nix
index d3de3a07..e7c1f31e 100644
--- a/hosts/nixedo/configuration.nix
+++ b/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
 
diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix
index 20e6929f..2dd0de9f 100644
--- a/hosts/t480/configuration.nix
+++ b/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
diff --git a/hosts/t490/configuration.nix b/hosts/t490/configuration.nix
index 9b947f7a..ca29602a 100644
--- a/hosts/t490/configuration.nix
+++ b/hosts/t490/configuration.nix
@@ -9,7 +9,7 @@
     ./services
     ./users.nix
 
-    ../../modules/mixins/common
+    ../../modules/mixins/common.nix
 
     ../../users/opdavies
   ];
diff --git a/modules/mixins/common/default.nix b/modules/mixins/common.nix
similarity index 98%
rename from modules/mixins/common/default.nix
rename to modules/mixins/common.nix
index b4af3823..133ef504 100644
--- a/modules/mixins/common/default.nix
+++ b/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; [
diff --git a/modules/mixins/common/programs.nix b/modules/mixins/gnupg.nix
similarity index 71%
rename from modules/mixins/common/programs.nix
rename to modules/mixins/gnupg.nix
index 71dc03e2..1ed32dc9 100644
--- a/modules/mixins/common/programs.nix
+++ b/modules/mixins/gnupg.nix
@@ -7,10 +7,5 @@
       enableSSHSupport = true;
       pinentryPackage = pkgs.pinentry-qt;
     };
-
-    zsh = {
-      enable = true;
-      histSize = 5000;
-    };
   };
 }