diff --git a/hosts/nabro/default.nix b/hosts/nabro/default.nix
index f99efc5..d31732e 100644
--- a/hosts/nabro/default.nix
+++ b/hosts/nabro/default.nix
@@ -14,6 +14,7 @@
       desktop.enable = true;
       dev.enable = true;
       shell.enable = true;
+      zsh.enable = true;
     };
   };
 }
diff --git a/modules/default.nix b/modules/default.nix
index a05cbc2..2e5363f 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -6,6 +6,6 @@
     ./user.nix
     ./desktop.nix
     ./dev.nix
-    ./shell.nix
+    ./shell
   ];
 }
diff --git a/modules/shell.nix b/modules/shell/default.nix
similarity index 80%
rename from modules/shell.nix
rename to modules/shell/default.nix
index bdbd29b..e65cf21 100644
--- a/modules/shell.nix
+++ b/modules/shell/default.nix
@@ -2,8 +2,16 @@
 
 let
   cfg = config.dotfiles.shell;
+
+  shellDir = ./.;
+  otherShellFiles = builtins.filter
+    (name: name != "default.nix" && lib.strings.hasSuffix ".nix" name)
+    (builtins.attrNames (builtins.readDir shellDir));
+  importedModules = map (file: shellDir + "/${file}") otherShellFiles;
 in
 {
+  imports = importedModules;
+
   options.dotfiles.shell = {
     enable = lib.mkEnableOption "Shell, Git, GPG, and CLI environment";
   };
@@ -12,7 +20,6 @@ in
     environment.systemPackages = with pkgs; [
       git
       wget
-      tree
       tealdeer
       gnupg
       pass
@@ -20,6 +27,8 @@ in
       btop
       helix
       opencode
+      fd
+      ripgrep
     ];
 
     home-manager.users."${userVars.username}" = {
@@ -46,18 +55,6 @@ in
         pinentry.package = pkgs.pinentry-curses;
       };
 
-      programs.bash = {
-        enable = true;
-        shellAliases = {
-          ll = "ls -lha";
-        };
-      };
-
-      programs.fzf = {
-        enable = true;
-        enableBashIntegration = true;
-      };
-
       programs.helix = {
         enable = true;
         defaultEditor = true;
diff --git a/modules/shell/zsh.nix b/modules/shell/zsh.nix
new file mode 100644
index 0000000..d050055
--- /dev/null
+++ b/modules/shell/zsh.nix
@@ -0,0 +1,247 @@
+{ config, lib, pkgs, userVars, ... }:
+
+let
+  cfg = config.dotfiles.zsh;
+in
+{
+  options.dotfiles.zsh = {
+    enable = lib.mkEnableOption "Fully configured Zsh terminal environment";
+  };
+
+  config = lib.mkIf cfg.enable {
+    programs.zsh.enable = true;
+
+    users.users."${userVars.username}".shell = pkgs.zsh;
+
+    home-manager.users."${userVars.username}" = {
+      programs.zsh = {
+        enable = true;
+        enableCompletion = false;
+        autosuggestion.enable = true;
+        syntaxHighlighting.enable = true;
+
+        dotDir = "/home/${userVars.username}/.config/zsh";
+
+        history = {
+          size = 10000;
+          save = 10000;
+          path = "$HOME/.local/share/zsh/history";
+          ignoreDups = true;
+          ignoreAllDups = true;
+          ignoreSpace = true;
+          share = true;
+          extended = true;
+        };
+
+        plugins = [
+          {
+            name = "fast-syntax-highlighting";
+            src = pkgs.zsh-fast-syntax-highlighting.src;
+          }
+          {
+            name = "zsh-autosuggestions";
+            src = pkgs.zsh-autosuggestions.src;
+          }
+          {
+            name = "zsh-history-substring-search";
+            src = pkgs.zsh-history-substring-search.src;
+          }
+          {
+            name = "fzf-tab";
+            src = pkgs.zsh-fzf-tab.src;
+          }
+        ];
+
+        shellAliases = {
+          ls = "eza --group-directories-first";
+          ll = "eza -l --group-directories-first --git";
+          la = "eza -la --group-directories-first --git";
+          lt = "eza --tree --level=2";
+          cat = "bat --paging=never";
+          grep = "grep --color=auto";
+          gs = "git status -sb";
+          gd = "git diff";
+          gc = "git commit";
+          gp = "git push";
+          ga = "git add -A";
+          gm = "git add -m";
+          gl = "git log --oneline";
+          rebuild = "sudo nixos-rebuild switch --flake ~/dotfiles-nix#nabro";
+          cleanup = "sudo nix-collect-garbage -d";
+          ".." = "cd ..";
+          "..." = "cd ../..";
+        };
+
+        # initContent = ''
+        #   # -- completions configuration --
+        #   # base completion styling (fzf-tab overrides the visual menu below)
+        #   zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}'
+        #   zstyle ':completion:*' list-colors "''${(s.:.)LS_COLORS}"
+        #   zstyle ':completion:*:descriptions' format '%F{blue}-- %d --%f'
+        #   zstyle ':completion:*' rehash true
+
+        #   # disable the plain menu so fzf-tab takes over Tab completion
+        #   zstyle ':completion:*' menu no
+
+        #   # -- keybindings --
+        #   bindkey -e   # emacs bindings; swap for `bindkey -v` if you want vi-mode
+        #   bindkey '^[[A' history-substring-search-up
+        #   bindkey '^[[B' history-substring-search-down
+        #   bindkey '^ ' autosuggest-accept
+
+        #   # -- shell options --
+        #   setopt AUTO_CD
+        #   setopt AUTO_PUSHD
+        #   setopt PUSHD_IGNORE_DUPS
+        #   setopt EXTENDED_GLOB
+        #   setopt INTERACTIVE_COMMENTS
+        #   setopt NO_BEEP
+
+        #   # -- fzf-tab behavior --
+        #   zstyle ':fzf-tab:*' fzf-command fzf
+        #   zstyle ':fzf-tab:complete:*:*' fzf-preview \
+        #     'bat --color=always --style=numbers --line-range=:100 $realpath 2>/dev/null || eza -1 --color=always $realpath 2>/dev/null'
+        #   zstyle ':fzf-tab:*' switch-group ',' '.'
+        # '';
+      };
+
+      programs.starship = {
+        
+        enable = true;
+        enableZshIntegration = true;
+
+        settings = {
+          add_newline = false;
+          command_timeout = 500;
+          scan_timeout = 10;
+
+          format = lib.concatStrings [
+            "$directory"
+            "$git_branch"
+            "$git_status"
+            "$nix_shell"
+            "$python"
+            "$c"
+            "$rust"
+            "$cmd_duration"
+            "$jobs"
+            "$line_break"
+            "$character"
+          ];
+
+          character = {
+            success_symbol = "[❯](bold green)";
+            error_symbol = "[❯](bold red)";
+            vimcmd_symbol = "[❮](bold yellow)";
+          };
+
+          directory = {
+            style = "bold cyan";
+            truncation_length = 3;
+            truncate_to_repo = true;
+            truncation_symbol = "…/";
+            read_only = " 🔒";
+          };
+
+          git_branch = {
+            style = "bold purple";
+            format = "[$symbol$branch]($style) ";
+            symbol = " ";
+          };
+
+          git_status = {
+            style = "bold red";
+            format = "([$all_status$ahead_behind]($style)) ";
+            conflicted = "=";
+            ahead = "⇡\${count}";
+            behind = "⇣\${count}";
+            diverged = "⇕⇡\${ahead_count}⇣\${behind_count}";
+            staged = "+\${count}";
+            modified = "!\${count}";
+            untracked = "?\${count}";
+            stashed = "\$";
+          };
+
+          nix_shell = {
+            style = "bold blue";
+            format = "[$symbol$state( \($name\))]($style) ";
+            symbol = "❄ ";
+            impure_msg = "impure";
+            pure_msg = "pure";
+          };
+
+          python = {
+            style = "bold yellow";
+            format = "[$symbol$version( \($virtualenv\))]($style) ";
+            symbol = "🐍 ";
+            detect_extensions = [ "py" ];
+            detect_files = [ "pyproject.toml" "requirements.txt" "uv.lock" ];
+          };
+
+          c = {
+            style = "bold dimmed white";
+            format = "[$symbol($version(-$name))]($style) ";
+            symbol = " ";
+            detect_extensions = [ "c" "h" ];
+          };
+
+          rust = {
+            disabled = true;
+          };
+
+          cmd_duration = {
+            style = "bold yellow";
+            format = "[$duration]($style) ";
+            min_time = 2000;
+            show_notifications = false;
+          };
+
+          jobs = {
+            style = "bold blue";
+            symbol = "✦";
+            number_threshold = 1;
+          };
+
+          aws.disabled = true;
+          gcloud.disabled = true;
+          docker_context.disabled = true;
+          kubernetes.disabled = true;
+          package.disabled = true;
+          battery.disabled = true;
+        };
+  
+      };
+
+      programs.zoxide = {
+        enable = true;
+        enableZshIntegration = true;
+      };
+
+      programs.eza = {
+        enable = true;
+        enableZshIntegration = true;
+        icons = "auto";
+      };
+
+      programs.bat = {
+        enable = true;
+        config = {
+          theme = "ansi";
+        };
+      };
+
+      programs.direnv = {
+        enable = true;
+        enableZshIntegration = true;
+        nix-direnv.enable = true;
+      };
+
+      programs.fzf = {
+        enable = true;
+        enableBashIntegration = true;
+        enableZshIntegration = true;
+        defaultCommand = "fd --type f --hidden --exclude .git";
+      };
+    };
+  };
+}