From f7735089dfc8e8c66b163bed5d75921507dbc1f6 Mon Sep 17 00:00:00 2001
From: John Lancaster <32917998+jsl12@users.noreply.github.com>
Date: Sun, 8 Mar 2026 12:37:00 -0500
Subject: [PATCH] combined shell with shell-tools

---
 modules/home-manager/profiles/shell-tools.nix | 45 ++++++++++++-------
 modules/home-manager/shell.nix                | 19 --------
 2 files changed, 30 insertions(+), 34 deletions(-)
 delete mode 100644 modules/home-manager/shell.nix

diff --git a/modules/home-manager/profiles/shell-tools.nix b/modules/home-manager/profiles/shell-tools.nix
index 1263008..669c84d 100644
--- a/modules/home-manager/profiles/shell-tools.nix
+++ b/modules/home-manager/profiles/shell-tools.nix
@@ -1,23 +1,38 @@
-{ inputs, ... }:
+# This module provides all the shell options
+{ inputs, lib, ... }:
 {
-  flake.homeModules.shell-tools = { pkgs, ... }: {
+  flake.homeModules.shell-tools = { config, pkgs, ... }: {
+    options.shell.program = lib.mkOption {
+      type = lib.types.enum [ "bash" "zsh" ];
+      default = "zsh";
+      description = "Which interactive shell configuration to enable.";
+    };
+
     imports = with inputs.self.homeModules; [
-      shell # Includes option to select between zsh and bash
-      
+      bash
+      zsh
+
       # Tools
       eza
       files
     ];
-    home.packages = with pkgs; [
-      wget
-      curl
-      cacert
-      busybox
-      gnugrep
-      dig
-      btop
-      uv
-      xclip
-    ];
+
+    config = {
+      programs.bash.enable = lib.mkForce (config.shell.program == "bash");
+      programs.zsh.enable  = lib.mkForce (config.shell.program == "zsh");
+      home.shell.enableShellIntegration = true;
+
+      home.packages = with pkgs; [
+        wget
+        curl
+        cacert
+        busybox
+        gnugrep
+        dig
+        btop
+        uv
+        xclip
+      ];
+    };
   };
 }
diff --git a/modules/home-manager/shell.nix b/modules/home-manager/shell.nix
deleted file mode 100644
index be1e7f0..0000000
--- a/modules/home-manager/shell.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ inputs, lib, ... }:
-{
-  flake.homeModules.shell = { config, ... }:
-  {
-    options.shell.program = lib.mkOption {
-      type = lib.types.enum [ "bash" "zsh" ];
-      default = "zsh";
-      description = "Which interactive shell configuration to enable.";
-    };
-
-    imports = with inputs.self.homeModules; [ bash zsh ];
-
-    config = {
-      programs.bash.enable = lib.mkForce (config.shell.program == "bash");
-      programs.zsh.enable  = lib.mkForce (config.shell.program == "zsh");
-      home.shell.enableShellIntegration = true;
-    };
-  };
-}