diff --git a/hosts/chris-laptop/default.nix b/hosts/chris-laptop/default.nix
index d2aa85c..8daf33f 100644
--- a/hosts/chris-laptop/default.nix
+++ b/hosts/chris-laptop/default.nix
@@ -30,6 +30,7 @@
 
     shell = {
       default = "zsh";
+      corePkgs.enable = true;
     };
   };
 }
diff --git a/hosts/chris-pc/default.nix b/hosts/chris-pc/default.nix
index 7749f7d..b75693c 100644
--- a/hosts/chris-pc/default.nix
+++ b/hosts/chris-pc/default.nix
@@ -43,10 +43,7 @@
 
     shell = {
       default = "zsh";
-      toolset = {
-        git.enable = true;
-        gnupg.enable = true;
-      };
+      corePkgs.enable = true;
     };
   };
 }
diff --git a/hosts/chris-server/default.nix b/hosts/chris-server/default.nix
index 1480e98..975ad8c 100644
--- a/hosts/chris-server/default.nix
+++ b/hosts/chris-server/default.nix
@@ -28,10 +28,7 @@
 
     shell = {
       default = "zsh";
-      toolset = {
-        git.enable = true;
-        gnupg.enable = true;
-      };
+      corePkgs.enable = true;
     };
   };
 }
diff --git a/modules/shell/default.nix b/modules/shell/default.nix
index f591b95..54054bf 100644
--- a/modules/shell/default.nix
+++ b/modules/shell/default.nix
@@ -21,6 +21,8 @@ in
   config = mkMerge [
     (mkIf (cfg.default != null) {
       users.defaultUserShell = pkgs."${cfg.default}";
+
+      modules.shell.toolset.gnupg.enable = true;
     })
 
     (mkIf cfg.corePkgs.enable {