From 04f26c2c8762cc5eb729a0f86415937ade3a1165 Mon Sep 17 00:00:00 2001
From: NullBite <me@nullbite.com>
Date: Sat, 30 Mar 2024 12:35:20 -0400
Subject: [PATCH] home: configure bash, enable both bash and zsh

---
 flake.nix             |  3 +++
 home/profile/base.nix | 13 +++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/flake.nix b/flake.nix
index fd37b1e..cac41f4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -313,6 +313,9 @@
       "nullbite@rpi4" = mkHome {
         system = "aarch64-linux";
         stateVersion = "23.11";
+        modules = [
+          { programs.zsh.enable = false; }
+        ];
       };
       "testuser" = mkHome {
         username = "testuser";
diff --git a/home/profile/base.nix b/home/profile/base.nix
index 2f18c20..2958e4d 100644
--- a/home/profile/base.nix
+++ b/home/profile/base.nix
@@ -25,15 +25,24 @@ in
     programs.fzf.enable = lib.mkDefault true;
     programs.fzf.enableZshIntegration = lib.mkDefault true;
     programs.fzf.enableBashIntegration = lib.mkDefault true;
+
+    programs.bash = {
+      enable = lib.mkDefault true;
+      initExtra = ''
+        export HOME_MANAGER_MANAGED=true;
+        [[ -e ~/dotfiles/shell/.bashrc ]] && . ~/dotfiles/shell/.bashrc ]]
+        unset HOME_MANAGERR_MANAGED
+      '';
+    };
     programs.zsh = {
-      enable = lib.mkDefault (!config.programs.bash.enable);
+      enable = lib.mkDefault true;
       initExtra = ''
         export HOME_MANAGER_MANAGED=true
         [[ -e ~/dotfiles/shell/.zshrc ]] && . ~/dotfiles/shell/.zshrc ]]
         unset HOME_MANAGER_MANAGED
       '';
       oh-my-zsh = {
-        enable = true;
+        enable = lib.mkDefault true;
         theme = "robbyrussell";
         extraConfig = ''
           DISABLE_MAGIC_FUNCTIONS="true"