fix package imports

modules/home/shell/default.nix

@@ -33,24 +33,26 @@ in
         tmux.enable = true;
       };
 
-      user.packages = attrValues {
-        inherit (pkgs) any-nix-shell pwgen yt-dlp ripdrag yazi;
-        inherit (pkgs) bat fd zoxide;
+      home-manager.users.${user} = {
+        home.packages = attrValues {
+          inherit (pkgs) any-nix-shell pwgen yt-dlp ripdrag yazi;
+          inherit (pkgs) bat fd zoxide;
 
-        rgFull = pkgs.ripgrep.override {withPCRE2 = true;};
-      };
-
-      home-manager.users.${user}.programs = {
-        direnv = {
-          enable = true;
-          nix-direnv.enable = true;
-          config.whitelist.prefix = ["/home"];
+          rgFull = pkgs.ripgrep.override {withPCRE2 = true;};
         };
 
-        bat.enable = true;
-        eza.enable = true;
-        fzf.enable = true;
-        zoxide.enable = true;
+        programs = {
+          direnv = {
+            enable = true;
+            nix-direnv.enable = true;
+            config.whitelist.prefix = ["/home"];
+          };
+
+          bat.enable = true;
+          eza.enable = true;
+          fzf.enable = true;
+          zoxide.enable = true;
+        };
       };
     })
   ];

modules/home/shell/toolset/git.nix

@@ -1,7 +1,7 @@
 { config, options, lib, pkgs, user, ... }:
 let
   inherit (builtins) readFile;
-  inherit (lib.attrsets) attrValues optionalAttrs;
+  inherit (lib.attrsets) attrValues;
   inherit (lib.modules) mkIf;
 in
 {
@@ -10,17 +10,15 @@ in
   in { enable = mkEnableOption "version-control system"; };
 
   config = mkIf config.modules.${user}.shell.toolset.git.enable {
-    user.packages = attrValues ({
-        inherit (pkgs) act dura lazygit;
-        inherit (pkgs.gitAndTools) gh git-open;
-      }
-      // optionalAttrs config.modules.${user}.shell.toolset.gnupg.enable {
-        inherit (pkgs.gitAndTools) git-crypt;
-      });
-
     environment.sessionVariables.GITHUB_TOKEN = "$(cat /run/agenix/tokenGH)";
 
-    home-manager.users.${user}.programs = {
+    home-manager.users.${user} = {
+      home.packages = attrValues {
+        inherit (pkgs) act dura lazygit;
+        inherit (pkgs.gitAndTools) gh git-open git-crypt;
+      };
+
+      programs = {
       zsh.initExtra = ''
         # -------===[ Helpful Git Fn's ]===------- #
         gitignore() {
@@ -113,5 +111,6 @@ in
         };
       };
     };
+    };
   };
 }

modules/home/shell/toolset/starship.nix

@@ -5,7 +5,9 @@ in
 {
   options.modules.${user}.shell.toolset.starship = let
     inherit (lib.options) mkEnableOption;
-  in { enable = mkEnableOption "minimal shell ricing"; };
+  in { 
+    enable = mkEnableOption "minimal shell ricing"; 
+  };
 
   config = mkIf config.modules.${user}.shell.toolset.starship.enable {
     home-manager.users.${user}.programs.starship = {