From 9497b67ef9e6f397ba146cc4c12fec8e9ecae7b2 Mon Sep 17 00:00:00 2001 From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com> Date: Fri, 5 Sep 2025 13:38:29 -0500 Subject: allow same configurations for fish in bash --- modules/terminal/system/programs/starship.nix | 37 ++++++++++++++++----------- 1 file changed, 22 insertions(+), 15 deletions(-) (limited to 'modules/terminal/system/programs/starship.nix') diff --git a/modules/terminal/system/programs/starship.nix b/modules/terminal/system/programs/starship.nix index c70a132..f0134f0 100644 --- a/modules/terminal/system/programs/starship.nix +++ b/modules/terminal/system/programs/starship.nix @@ -36,21 +36,28 @@ in lib.mkIf cfg.enable { hjem.users."${config.collinux.user.name}" = { - files = { - ".config/starship.toml" = { - generator = (pkgs.formats.toml {}).generate "starship.toml"; - value = settings; - }; - - ".config/fish/conf.d/starship.fish".text = lib.mkIf config.collinux.terminal.shells.fish.enable '' - function starship_transient_prompt_func - starship module character - end - - starship init fish | source - enable_transience - ''; - }; + files = + { + ".config/starship.toml" = { + generator = (pkgs.formats.toml {}).generate "starship.toml"; + value = settings; + }; + } + // (lib.optionalAttrs config.collinux.terminal.shells.fish.enable { + ".config/fish/conf.d/starship.fish".text = '' + function starship_transient_prompt_func + starship module character + end + + starship init fish | source + enable_transience + ''; + }) + // (lib.optionalAttrs config.collinux.terminal.shells.bash.enable { + ".config/bash/conf.d/starship.bash".text = '' + eval "$(starship init bash)" + ''; + }); packages = [pkgs.starship]; }; -- cgit v1.3.1