you know the drill at this point

modules/home/shell/default.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, namespace, ... }:
 let
-  inherit (lib) attrValues mkIf mkMerge mkOption mkEnableOption;
+  inherit (lib) attrValues mkIf mkMerge mkOption mkEnableOption mkDefault;
   inherit (lib.types) nullOr enum;
 
   cfg = config.${namespace}.shell;
@@ -12,17 +12,18 @@ in
       default = null;
       description = "Default system shell";
     };
-
+    
     corePkgs.enable = mkEnableOption "core shell packages";
   };
 
   config = mkMerge [
-    (mkIf (cfg.default != null) {
-      users.defaultUserShell = pkgs."${cfg.default}";
-    })
+    # (if (cfg.default != null) then { 
+    #   shell = pkgs."${cfg.default}";
+    # } else {})
 
-    (mkIf cfg.corePkgs.enable {
-      ${namespace}.shell.toolset = {
+    
+    (mkIf (cfg.corePkgs.enable) {
+      ${namespace}.shell.toolset = mkDefault {
         bat.enable = true;
         btop.enable = true;
         eza.enable = true;
@@ -33,7 +34,9 @@ in
         yazi.enable = true;
         zoxide.enable = true;
       };
+    })
 
+    ({
       home.packages = with pkgs; [ any-nix-shell pwgen yt-dlp ripdrag fd (ripgrep.override {withPCRE2 = true;}) ];
 
       programs = {
@@ -50,4 +53,4 @@ in
       };
     })
   ];
-}
+}

modules/home/shell/toolset/bat/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, user, ... }:
+{ config, lib, pkgs, namespace, ... }:
 let
   inherit (lib) mkIf mkEnableOption;
 

modules/home/shell/toolset/btop/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, user, ... }:
+{ config, lib, pkgs, namespace, ... }:
 let
   inherit (lib) mkIf mkEnableOption;
   inherit (lib.strings) concatStringsSep;

modules/home/shell/toolset/eza/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, user, ... }:
+{ config, lib, pkgs, namespace, ... }:
 let
   inherit (lib) mkIf mkEnableOption;
 

modules/home/shell/toolset/fzf/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, user, ... }:
+{ config, lib, pkgs, namespace, ... }:
 let
   inherit (lib) mkIf mkEnableOption;
 

modules/home/shell/toolset/git/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, user, ... }:
+{ config, lib, pkgs, namespace, ... }:
 let
   inherit (lib) mkEnableOption mkIf;
 
@@ -10,7 +10,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    environment.sessionVariables.GITHUB_TOKEN = "$(cat /run/agenix/tokenGH)";
+    home.sessionVariables.GITHUB_TOKEN = "$(cat /run/agenix/tokenGH)";
 
     home.packages = with pkgs; [ lazygit lazyjj jujutsu ];
 

modules/home/shell/toolset/gnugpg/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, user, ... }:
+{ config, lib, pkgs, namespace, ... }:
 let
   inherit (lib) mkIf mkEnableOption;
 
@@ -10,27 +10,27 @@ in
   };
 
   config = mkIf cfg.enable {
-    user.package = with pkgs; [ gnupg ];
+    # home.packages = with pkgs; [ gnupg ];
 
-    environment.variables.GNUPGHOME = "$XDG_CONFIG_HOME/gnupg";
+    # home.sessionVariables.GNUPGHOME = "$XDG_CONFIG_HOME/gnupg";
 
-    programs.gnupg = {
-      enable = true;
+    # programs.gnupg = {
+    #   enable = true;
 
-      agent = {
-        enable = true;
-        enableSSHSupport = true;
-        pinentryPackage = pkgs.pinentry-gnome3;
+    #   agent = {
+    #     enable = true;
+    #     enableSSHSupport = true;
+    #     pinentryPackage = pkgs.pinentry-gnome3;
 
-        settings = let
-          cacheTTL = 86400;
-        in {
-          default-cache-ttl = cacheTTL;
-          default-cache-ttl-ssh = cacheTTL;
-          max-cache-ttl = cacheTTL;
-          max-cache-ttl-ssh = cacheTTL;
-        };
-      };
-    };
+    #     settings = let
+    #       cacheTTL = 86400;
+    #     in {
+    #       default-cache-ttl = cacheTTL;
+    #       default-cache-ttl-ssh = cacheTTL;
+    #       max-cache-ttl = cacheTTL;
+    #       max-cache-ttl-ssh = cacheTTL;
+    #     };
+    #   };
+    # };
   };
 }

modules/home/shell/toolset/starship/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, user, ... }:
+{ config, lib, pkgs, namespace, ... }:
 let
   inherit (lib) mkIf mkEnableOption;
 

modules/home/shell/toolset/tmux/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, user, ... }:
+{ config, lib, pkgs, namespace, ... }:
 let
   inherit (lib) mkIf mkEnableOption;
 

modules/home/shell/toolset/yazi/default.nix

@@ -1,7 +1,6 @@
-{ config, lib, pkgs, user, ... }:
+{ config, lib, pkgs, namespace, ... }:
 let
-  inherit (lib.${namespace}) mkIf;
-  inherit (lib.options) mkEnableOption;
+  inherit (lib) mkIf mkEnableOption;
 
   cfg = config.${namespace}.shell.toolset.yazi;
 in

modules/home/shell/toolset/zellij/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, user, ... }:
+{ config, lib, pkgs, namespace, ... }:
 let
   inherit (lib) mkIf mkEnableOption;
 

modules/home/shell/toolset/zoxide/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, user, ... }:
+{ config, lib, pkgs, namespace, ... }:
 let
   inherit (lib) mkIf mkEnableOption;
 

modules/home/shell/zsh/default.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, namespace, ... }:
 let
-  inherit (lib) mkIf;
+  inherit (lib) mkIf mkEnableOption;
 
   cfg = config.${namespace}.shell.zsh;
 in
@@ -10,13 +10,9 @@ in
   };
 
   config = mkIf cfg.enable {
-    ${namespace}.shell = {
-      zsh.enable = true;
-      corePkgs.enable = true;
-    };
-
-    # Enable completion for sys-packages:
-    environment.pathsToLink = ["/share/zsh"];
+    # ${namespace}.shell = {
+    #   zsh.enable = true;
+    # };
 
     programs = {
       starship.enableZshIntegration = true;