Updates to Starship

This commit is contained in:
albert 2025-01-07 10:56:09 -08:00
parent 5b662326ba
commit b20024a9d9
Signed by: albert
GPG key ID: 3895DD267CA11BA9
3 changed files with 24 additions and 18 deletions

View file

@ -2,12 +2,10 @@
{ ... }: { { ... }: {
imports = [ imports = [
./dconf-dock.nix ./dconf-dock.nix
# TODO Re-eanble this when in hm 24.11 ../../software/gui/ghostty.nix
# ../../software/gui/ghostty.nix
]; ];
programs.bash.sessionVariables = { programs.bash.sessionVariables = {
DISABLE_TMUX = "true"; DISABLE_TMUX = "true";
GTK_THEME = "Breeze"; # To set the firefox theme
}; };
programs.fish.shellInit = '' programs.fish.shellInit = ''
set DISABLE_TMUX "true" set DISABLE_TMUX "true"

View file

@ -12,8 +12,8 @@ let
errorFG = "#${config.lib.stylix.colors.base00}"; errorFG = "#${config.lib.stylix.colors.base00}";
timeFG = "#${config.lib.stylix.colors.base0C}"; timeFG = "#${config.lib.stylix.colors.base0C}";
# blackColor = "#${config.lib.stylix.colors.base00}"; blackColor = "#${config.lib.stylix.colors.base00}";
# whiteColor = "#${config.lib.stylix.colors.base06}"; whiteColor = "#${config.lib.stylix.colors.base06}";
in in
{ {
programs.starship = { programs.starship = {
@ -22,21 +22,23 @@ in
enableFishIntegration = true; enableFishIntegration = true;
settings = { settings = {
format = lib.concatStrings [ format = lib.concatStrings [
# "[](${usernameBG})" # Othe symbols:   //   //    
# "$username" "[](${blackColor})"
# "$hostname" "$time"
# "[](bg:${directoryBG} fg:${usernameBG})" "[](bg:${usernameBG} fg:${blackColor})"
"[](${directoryBG})" "$hostname"
"[](fg:${usernameBG} bg:${directoryBG})"
# "[](${directoryBG})"
"$directory" "$directory"
"[](fg:${directoryBG} bg:${statusBG})" "[](fg:${directoryBG} bg:${statusBG})"
"$git_branch" "$git_branch"
"$git_status" "$git_status"
"$rust" "$rust"
"$docker_context" "$docker_context"
"$nix_shell" "$nix_shell"
"[](fg:${statusBG} bg:${errorBG})" "[](fg:${statusBG} bg:${errorBG})"
"$status" "$status"
"[ ](fg:${errorBG})" "[ ](fg:${errorBG})"
]; ];
username = { username = {
@ -61,7 +63,7 @@ in
nix_shell = { nix_shell = {
disabled = false; disabled = false;
heuristic = true; heuristic = false;
symbol = " "; symbol = " ";
format = "[$symbol]($style)"; format = "[$symbol]($style)";
style = "fg:${statusFG} bg:${statusBG}"; style = "fg:${statusFG} bg:${statusBG}";
@ -106,7 +108,7 @@ in
time = { time = {
disabled = false; disabled = false;
time_format = "%R"; # Hour:Minute Format time_format = "%R"; # Hour:Minute Format
style = "fg:${timeFG} bg:${timeBG}"; style = "fg:${whiteColor} bg:${blackColor}";
format = "[ $time ]($style)"; format = "[ $time ]($style)";
}; };
}; };

View file

@ -1,9 +1,15 @@
{ theme, ... }: { { theme, ... }: {
imports = [ ../../../../stylix/themes/${theme}/home-manager/ghostty.nix ]; # TODO Re-enable this when 25.05 is out or when this is compabile with 24.11
# imports = [ ../../../../stylix/themes/${theme}/home-manager/ghostty.nix ];
# Otherwise it sets the term to "xterm-ghostty" and it fails to connect to ssh
programs.bash.sessionVariables = { TERM = "xterm-256color"; };
programs.fish.shellInit = ''set TERM "xterm-256color '';
programs.ghostty = { programs.ghostty = {
enable = true; # TODO Re-enable this when 25.05 is out or when this is compabile with 24.11
enable = false;
enableBashIntegration = true; enableBashIntegration = true;
enableFishIntegration = true; enableFishIntegration = true;
enableZshIntegration = true; enableZshIntegration = true;