combined shell with shell-tools

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
+    config = {
-      curl
+      programs.bash.enable = lib.mkForce (config.shell.program == "bash");
-      cacert
+      programs.zsh.enable  = lib.mkForce (config.shell.program == "zsh");
-      busybox
+      home.shell.enableShellIntegration = true;
-      gnugrep
+
-      dig
+      home.packages = with pkgs; [
-      btop
+        wget
-      uv
+        curl
-      xclip
+        cacert
-    ];
+        busybox
+        gnugrep
+        dig
+        btop
+        uv
+        xclip
+      ];
+    };
   };
 }

modules/home-manager/shell.nix

@@ -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;
-    };
-  };
-}