diff --git a/hosts/default/home.nix b/hosts/default/home.nix index 22c63f5..105b554 100644 --- a/hosts/default/home.nix +++ b/hosts/default/home.nix @@ -106,15 +106,6 @@ "electron-25.9.0" ]; - programs.bash = { - enable = false; - bashrcExtra = '' - . ~/.bashrc - eval "$(direnv hook bash)" - eval "$(starship init bash)" - ''; - }; - programs.zsh = { enable = true; enableCompletion = true; diff --git a/modules/home-manager/bash/default.nix b/modules/home-manager/bash/default.nix new file mode 100644 index 0000000..496754a --- /dev/null +++ b/modules/home-manager/bash/default.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: { + options = { + bash.enable = lib.mkEnableOption "enable bash"; + }; + config = lib.mkIf config.bash.enable { + programs.bash = { + enable = false; + bashrcExtra = '' + . ~/.bashrc + eval "$(direnv hook bash)" + eval "$(starship init bash)" + ''; + }; + }; +} diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index f43b81a..d2c444d 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -1,7 +1,10 @@ {lib, ...}: { imports = [ + ./bash ./session-vars ]; nixpkgs.config.allowUnfree = true; + + bash.enable = lib.mkDefault true; }