Consolidate shell related packages

modules/shell/zsh.nix

@@ -9,27 +9,33 @@ in {
   };
 
   config = mkIf cfg.enable {
-    home.packages = with pkgs; [
+    users.defaultUserShell = pkgs.zsh;
+
+    programs.zsh = {
+      enable = true;
+      enableCompletion = true;
+    };
+
+    user.packages = with pkgs; [
+      fd
+      fzf
+      jq
+      nix-zsh-completions
+      nnn
+      ripgrep
+      zsh
       zsh-autosuggestions
       zsh-fast-syntax-highlighting
       zsh-history-substring-search
     ];
 
-    home.programs.zsh = {
-      enable = true;
-      enableCompletion = true;
-      shellAliases = {
-        cp = "cp -iv";
-        mv = "mv -iv";
-        rm = "rm -v";
-        mkdir = "mkdir -v";
-        ls = "ls -h --color=auto --group-directories-first";
-        e = "nvim";
-        f = "nnn";
-        g = "git";
-        n = "nnn";
-        v = "nvim";
-      };
+    env = {
+      ZDOTDIR   = "$XDG_CONFIG_HOME/zsh";
+      ZSH_CACHE = "$XDG_CACHE_HOME/zsh";
+    };
+
+    home.configFile = {
+      "zsh" = {};
     };
   };
 }