diff --git a/home/hosts/andromache/default.nix b/home/hosts/andromache/default.nix
index bee7957..5c73e5e 100644
--- a/home/hosts/andromache/default.nix
+++ b/home/hosts/andromache/default.nix
@@ -18,6 +18,7 @@ in
     ../../modules/keepassxc.nix
     ../../modules/anki.nix
     ../../modules/browser
+    ../../modules/shell
   ];
 
   home.stateVersion = "25.05";
@@ -29,28 +30,12 @@ in
 
   browser.primary = "librewolf";
 
+  shell.bash = {
+    enable = true;
+    aliases.lang-js = true;
+  };
+
   programs = {
-    bash = {
-      enable = true;
-      enableCompletion = true;
-      initExtra = ''
-        for f in /home/${username}/.bashrc.d/*; do
-          [ -f "$f" ] && source "$f"
-        done
-
-        source /home/${username}/.bash_aliases/all
-        source /home/${username}/.bash_aliases/lang-js
-
-        # host-specific config goes here
-        # ...
-
-        export PATH=${../../../dots/.bin}:$PATH
-      '';
-    };
-    fzf = {
-      enable = true;
-      enableBashIntegration = true;
-    };
     home-manager.enable = true;
     taskwarrior.config.recurrence = lib.mkForce "on";
   };
@@ -61,11 +46,6 @@ in
   };
 
   home.file = {
-    ".inputrc".source = ../../../dots/.inputrc;
-    ".bashrc.d/prompt".source = ../../../dots/.bashrc.d/prompt;
-    ".bashrc.d/editor".source = ../../../dots/.bashrc.d/editor;
-    ".bash_aliases/all".source = ../../../dots/.bash_aliases/all;
-    ".bash_aliases/lang-js".source = ../../../dots/.bash_aliases/lang-js;
     ".config/kitty/kitty.conf".source = ../../../dots/.config/kitty/kitty.conf;
     ".config/kitty/themes/zenwritten_light.conf".source =
       ../../../dots/.config/kitty/themes/zenwritten_light.conf;
diff --git a/home/hosts/astyanax/default.nix b/home/hosts/astyanax/default.nix
index f4a1d86..9213324 100644
--- a/home/hosts/astyanax/default.nix
+++ b/home/hosts/astyanax/default.nix
@@ -16,6 +16,7 @@ in
     ../../modules/taskwarrior.nix
     ../../modules/keepassxc.nix
     ../../modules/browser
+    ../../modules/shell
   ];
 
   home.stateVersion = "25.05";
@@ -27,28 +28,12 @@ in
 
   browser.primary = "librewolf";
 
+  shell.bash = {
+    enable = true;
+    aliases.lang-js = true;
+  };
+
   programs = {
-    bash = {
-      enable = true;
-      enableCompletion = true;
-      initExtra = ''
-        for f in /home/${username}/.bashrc.d/*; do
-          [ -f "$f" ] && source "$f"
-        done
-
-        source /home/${username}/.bash_aliases/all
-        source /home/${username}/.bash_aliases/lang-js
-
-        # host-specific config goes here
-        # ...
-
-        export PATH=${../../../dots/.bin}:$PATH
-      '';
-    };
-    fzf = {
-      enable = true;
-      enableBashIntegration = true;
-    };
     home-manager.enable = true;
   };
 
@@ -58,11 +43,6 @@ in
   };
 
   home.file = {
-    ".inputrc".source = ../../../dots/.inputrc;
-    ".bashrc.d/prompt".source = ../../../dots/.bashrc.d/prompt;
-    ".bashrc.d/editor".source = ../../../dots/.bashrc.d/editor;
-    ".bash_aliases/all".source = ../../../dots/.bash_aliases/all;
-    ".bash_aliases/lang-js".source = ../../../dots/.bash_aliases/lang-js;
     ".config/kitty/kitty.conf".source = ../../../dots/.config/kitty/kitty.conf;
     ".config/kitty/themes/zenwritten_light.conf".source =
       ../../../dots/.config/kitty/themes/zenwritten_light.conf;