diff --git a/programs/starship.nix b/programs/starship.nix index 9dd0078..a353d6e 100644 --- a/programs/starship.nix +++ b/programs/starship.nix @@ -1,5 +1,5 @@ { lib }: -let language-format-string = " [$symbol($version )]($style)"; +let language-format-string = "[$symbol($version )]($style)"; in { enable = true; @@ -11,14 +11,13 @@ in { "$os" " " "($container )" - "($direnv)" "\\[" "([$username](bold yellow)@[$hostname](bold red) )" "[$directory](cyan)" "($git_branch$git_commit$git_state$git_metrics$git_status)" "\\] " - "($conda$nix_shell)" - "($julia$nodejs$python$quarto$rlang$ruby)" + "($package)" + "($conda$direnv$julia$nix_shell$nodejs$python$quarto$rlang$ruby)" "($shell)" "$character" ]; @@ -27,16 +26,6 @@ in { success_symbol = "[\\$](bold green)"; error_symbol = "[\\$](bold red)"; }; - conda = { format = "[$symbol$environment]($style) "; }; - direnv = { - disabled = false; - allowed_msg = ""; - not_allowed_msg = ""; - denied_msg = ""; - loaded_msg = ""; - unloaded_msg = ""; - symbol = " "; - }; git_metrics = { disabled = false; }; git_status = { # Remove trailing space from format string @@ -48,7 +37,7 @@ in { symbol = ""; impure_msg = "/󰓑"; pure_msg = "/󱕦"; - format = "[$symbol$state( ($name))]($style) "; + format = "[$symbol$state( ($name))]($style)"; }; nodejs = { format = language-format-string; }; os = { @@ -63,6 +52,10 @@ in { NixOS = ""; }; }; + package = { + format = language-format-string; + symbol = " "; + }; python = { format = "[\${symbol}\${pyenv_prefix}(\${version} )(($virtualenv) )]($style)";