From 99dc4515a1c6739fb6f7a24b742dbba9dc83b7a1 Mon Sep 17 00:00:00 2001
From: John Lancaster <32917998+jsl12@users.noreply.github.com>
Date: Mon, 16 Feb 2026 16:37:13 -0600
Subject: [PATCH] shell organization

---
 modules/home-manager/bash.nix  | 10 ++++++++++
 modules/home-manager/shell.nix | 26 +++++++++++++++++---------
 modules/home-manager/zsh.nix   |  9 ++-------
 3 files changed, 29 insertions(+), 16 deletions(-)
 create mode 100644 modules/home-manager/bash.nix

diff --git a/modules/home-manager/bash.nix b/modules/home-manager/bash.nix
new file mode 100644
index 0000000..b4a1f03
--- /dev/null
+++ b/modules/home-manager/bash.nix
@@ -0,0 +1,10 @@
+{
+  flake.homeModules.bash = { pkgs, lib, ... }:
+  {
+    programs.bash = {
+      enable = true;
+      enableCompletion = true;
+      package = pkgs.bash;
+    };
+  };
+}
\ No newline at end of file
diff --git a/modules/home-manager/shell.nix b/modules/home-manager/shell.nix
index 0fe7791..e71bb81 100644
--- a/modules/home-manager/shell.nix
+++ b/modules/home-manager/shell.nix
@@ -1,19 +1,27 @@
 { inputs, ... }:
 {
-  flake.homeModules.shell = {pkgs, ...}: {
+  imports = with inputs.self.homeModules; [
+    # Shells
+    bash
+    zsh
+    
+    # Tools
+    files
+    docker
+  ];
+
+  flake.homeModules.shell = {pkgs, ...}:
+  {
     programs.eza = {
       enable = true;
+      package = pkgs.eza;
       enableBashIntegration = true;
       enableZshIntegration = true;
-      extraOptions = [
-        "-lgos type --no-time"
-      ];
     };
 
-    imports = with inputs.self.homeModules; [
-      zsh
-      files
-      docker
-    ];
+    home.shell.enableShellIntegration = true;
+    home.shellAliases = {
+      ls = "${lib.getExe pkgs.eza} -lgos type --no-time --follow-symlinks";
+    };
   };
 }
diff --git a/modules/home-manager/zsh.nix b/modules/home-manager/zsh.nix
index 0093084..87ef31b 100644
--- a/modules/home-manager/zsh.nix
+++ b/modules/home-manager/zsh.nix
@@ -1,13 +1,9 @@
-{ inputs, ... }:
 {
-  flake.homeModules.zsh = { pkgs, config, lib, ... }:
+  flake.homeModules.zsh = { pkgs, ... }:
   {
-    home.packages = with pkgs; [
-      zsh
-    ];
-
     programs.zsh = {
       enable = true;
+      package = pkgs.zsh;
       enableCompletion = true;
       autosuggestion.enable = true;
       # syntaxHighlighting.enable = true;
@@ -36,7 +32,6 @@
           "ssh-agent"
         ];
       };
-      shellAliases.ls = "${lib.getExe pkgs.eza} -lgos type --no-time --follow-symlinks";
     };
   };
 }
\ No newline at end of file