From f219ce45c8696c863a095bce0f10a4938a67b776 Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Sun, 12 Mar 2023 19:00:59 -0400
Subject: [PATCH] enable actual bash support

---
 modules/common/shell/bash/default.nix | 20 ++++++++++++++++++++
 modules/common/shell/default.nix      |  1 +
 modules/common/shell/fish/default.nix |  1 -
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 modules/common/shell/bash/default.nix

diff --git a/modules/common/shell/bash/default.nix b/modules/common/shell/bash/default.nix
new file mode 100644
index 0000000..06a8367
--- /dev/null
+++ b/modules/common/shell/bash/default.nix
@@ -0,0 +1,20 @@
+{ config, pkgs, lib, ... }: {
+
+  config = {
+    home-manager.users.${config.user} = {
+
+      programs.bash = {
+        enable = true;
+        shellAliases =
+          config.home-manager.users.${config.user}.programs.fish.shellAliases;
+        initExtra = "";
+        profileExtra = "";
+      };
+
+      programs.starship.enableBashIntegration = false;
+      programs.zoxide.enableBashIntegration = true;
+      programs.fzf.enableBashIntegration = true;
+
+    };
+  };
+}
diff --git a/modules/common/shell/default.nix b/modules/common/shell/default.nix
index 9359d15..82af041 100644
--- a/modules/common/shell/default.nix
+++ b/modules/common/shell/default.nix
@@ -1,5 +1,6 @@
 { ... }: {
   imports = [
+    ./bash
     ./charm.nix
     ./direnv.nix
     ./fish
diff --git a/modules/common/shell/fish/default.nix b/modules/common/shell/fish/default.nix
index 672d92b..d2da044 100644
--- a/modules/common/shell/fish/default.nix
+++ b/modules/common/shell/fish/default.nix
@@ -76,7 +76,6 @@
         set -g fish_cursor_replace_one underscore
       '';
       loginShellInit = "";
-      shellAliases = { };
       shellAbbrs = {
 
         # Directory aliases