diff --git a/configurations/profile/home/default.nix b/configurations/profile/home/default.nix index 1c533d2..bdbd578 100644 --- a/configurations/profile/home/default.nix +++ b/configurations/profile/home/default.nix @@ -48,7 +48,7 @@ in enable = lib.mkDefault (cfg.enableTerminalExtra || cfg.enableNixDevel); nix-direnv.enable = lib.mkDefault (cfg.enableNixDevel && (config.programs.direnv.enable == true)); enableBashIntegration = lib.mkDefault config.programs.bash.enable; - #enableFishIntegration = lib.mkDefault config.programs.fish.enable; + enableFishIntegration = lib.mkDefault config.programs.fish.enable; enableZshIntegration = lib.mkDefault config.programs.zsh.enable; }; diff --git a/configurations/profile/home/shell/bash.nix b/configurations/profile/home/shell/bash.nix index 4579101..3efd68a 100644 --- a/configurations/profile/home/shell/bash.nix +++ b/configurations/profile/home/shell/bash.nix @@ -9,7 +9,7 @@ in config = lib.mkIf cfg.enable { programs.bash = { - enable = lib.mkDefault true; + enable = true; enableCompletion = lib.mkDefault true; enableVteIntegration = lib.mkDefault true; historyControl = lib.mkDefault [ "erasedups" "ignorespace" ]; diff --git a/configurations/profile/home/shell/fish.nix b/configurations/profile/home/shell/fish.nix index 4298ed8..a85c150 100644 --- a/configurations/profile/home/shell/fish.nix +++ b/configurations/profile/home/shell/fish.nix @@ -6,7 +6,7 @@ in options.materus.profile.fish.enable = materusArg.pkgs.lib.mkBoolOpt config.materus.profile.enableTerminalExtra "Enable materus fish config"; config = lib.mkIf cfg.enable { programs.fish = { - enable = lib.mkDefault true; + enable = true; }; }; } diff --git a/configurations/profile/home/shell/starship.nix b/configurations/profile/home/shell/starship.nix index 51df59b..8b88759 100644 --- a/configurations/profile/home/shell/starship.nix +++ b/configurations/profile/home/shell/starship.nix @@ -4,10 +4,10 @@ let cfg = config.materus.profile.starship; in { - options.materus.profile.starship.enable = materusArg.pkgs.lib.mkBoolOpt (profile.zsh.enable || profile.bash.enable || profile.fish.enable) "Enable materus fish config"; + options.materus.profile.starship.enable = materusArg.pkgs.lib.mkBoolOpt false "Enable materus starship config"; config = lib.mkIf cfg.enable { - programs.starship.enable = lib.mkDefault cfg.enable; + programs.starship.enable = true; programs.starship.settings = {