From a5213018186c604a831ad51ad5b59bdac4fca2af Mon Sep 17 00:00:00 2001
From: Nathan <nathanblunkall5@gmail.com>
Date: Tue, 19 Aug 2025 02:01:17 -0500
Subject: [PATCH] bash

---
 .../programs/terminal/bash/default.nix        | 28 +++++++++++++++++++
 home-manager/programs/terminal/default.nix    |  1 +
 home-manager/users/nathan/default.nix         |  2 +-
 system-config/users/default.nix               |  2 +-
 4 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 home-manager/programs/terminal/bash/default.nix

diff --git a/home-manager/programs/terminal/bash/default.nix b/home-manager/programs/terminal/bash/default.nix
new file mode 100644
index 0000000..fd1a31b
--- /dev/null
+++ b/home-manager/programs/terminal/bash/default.nix
@@ -0,0 +1,28 @@
+{ config, lib, pkgs, ... }: {
+
+    home.packages = with pkgs; [ oh-my-posh ];
+
+    programs.bash = {
+        enable = true;
+        enableCompletion = true;
+        blesh.enable = true;
+
+        shellAliases = {
+            ls = "eza";
+            ll = "ls -l";
+
+            ksh = "kitten ssh";
+
+            vi = "nvim";
+            vim = "nvim";
+
+        };
+
+        initContent = if config.homeconfig.wal.enable then (lib.mkBefore ''
+            cat ${config.home.homeDirectory}/.cache/wal/sequences
+            eval "$(oh-my-posh init bash --config ${config.home.homeDirectory}/.cache/wal/ohmyposh.toml)"
+        '') else (lib.mkBefore ''
+            eval "$(oh-my-posh init bash --config ${config.home.homeDirectory}/.config/ohmyposh/ohmyposh.toml)"
+        '');
+    };
+}
diff --git a/home-manager/programs/terminal/default.nix b/home-manager/programs/terminal/default.nix
index 52de2fc..a972952 100644
--- a/home-manager/programs/terminal/default.nix
+++ b/home-manager/programs/terminal/default.nix
@@ -2,6 +2,7 @@
 
   imports = [
     ./bat
+    ./bash
     ./eza
     ./fzf
     ./tmux
diff --git a/home-manager/users/nathan/default.nix b/home-manager/users/nathan/default.nix
index defeb74..2d7309f 100644
--- a/home-manager/users/nathan/default.nix
+++ b/home-manager/users/nathan/default.nix
@@ -7,7 +7,7 @@
         ./dotfiles
 	];
 
-    config = lib.mkIf (config.homeconfig.username == "nathan") {
+    config = {
 
         homeconfig = {
             mpd.enable = lib.mkDefault true;
diff --git a/system-config/users/default.nix b/system-config/users/default.nix
index 369a773..9cbdb36 100644
--- a/system-config/users/default.nix
+++ b/system-config/users/default.nix
@@ -96,7 +96,7 @@
                                 graphical = config.sysconfig.graphical;
                             };
                         }
-                    ] ++ (if inputs ? ${x} then [ (inputs.${x} { config = config.home-manager.users.${x}; inherit lib pkgs inputs; }) ] else []) 
+                    ] ++ (if inputs ? ${x} then [ (inputs.${x} /*{ config = config.home-manager.users.${x}; inherit lib pkgs inputs; }*/) ] else []) 
                       ++ config.sysconfig.users.${x}.home-manager.extraModules));
                 })
                 (builtins.partition