diff --git a/nixos/home/base/default.nix b/nixos/home/base/default.nix
index 706c6c1..f83134a 100644
--- a/nixos/home/base/default.nix
+++ b/nixos/home/base/default.nix
@@ -1,8 +1,11 @@
 {
   imports = [
+    ./env-vars.nix
     ./git.nix
     ./home.nix
     ./pkg-sets/cli-utils.nix
+    ./shells/bash.nix
+    ./shells/direnv.nix
     ./shells/fish.nix
     ./shells/nushell.nix
     ./xdg-symlinks.nix
diff --git a/nixos/home/base/env-vars.nix b/nixos/home/base/env-vars.nix
new file mode 100644
index 0000000..0f701f0
--- /dev/null
+++ b/nixos/home/base/env-vars.nix
@@ -0,0 +1,12 @@
+{config, ...}: {
+  home.sessionVariables = rec {
+    DIRENV_WARN_TIMEOUT = "30s";
+    CODE = "${config.home.homeDirectory}/code";
+    TMPCODE = "${CODE}/tmp";
+    REPOS = "${CODE}/repos";
+    CFG = "${REPOS}/dotfiles";
+    DLANG = "${REPOS}/dlang";
+    WORK = "${REPOS}/metacraft-labs";
+    MINE = "${REPOS}mine";
+  };
+}
diff --git a/nixos/home/base/home.nix b/nixos/home/base/home.nix
index 888c0a4..d87a4ae 100644
--- a/nixos/home/base/home.nix
+++ b/nixos/home/base/home.nix
@@ -11,21 +11,5 @@
   };
 
   manual.manpages.enable = false;
-
-  programs = {
-    home-manager.enable = true;
-    bash.enable = true;
-    direnv.enable = true;
-  };
-
-  home.sessionVariables = rec {
-    DIRENV_WARN_TIMEOUT = "30s";
-    CODE = "${config.home.homeDirectory}/code";
-    TMPCODE = "${CODE}/tmp";
-    REPOS = "${CODE}/repos";
-    CFG = "${REPOS}/dotfiles";
-    DLANG = "${REPOS}/dlang";
-    WORK = "${REPOS}/metacraft-labs";
-    MINE = "${REPOS}mine";
-  };
+  programs.home-manager.enable = true;
 }
diff --git a/nixos/home/base/shells/bash.nix b/nixos/home/base/shells/bash.nix
new file mode 100644
index 0000000..5ef37a5
--- /dev/null
+++ b/nixos/home/base/shells/bash.nix
@@ -0,0 +1,3 @@
+{
+  programs.bash.enable = true;
+}
diff --git a/nixos/home/base/shells/direnv.nix b/nixos/home/base/shells/direnv.nix
new file mode 100644
index 0000000..636a9aa
--- /dev/null
+++ b/nixos/home/base/shells/direnv.nix
@@ -0,0 +1,3 @@
+{
+  programs.direnv.enable = true;
+}