diff --git a/modules/programs/gui/foot.nix b/modules/programs/gui/foot.nix index 8677994..3ad1f3f 100644 --- a/modules/programs/gui/foot.nix +++ b/modules/programs/gui/foot.nix @@ -17,10 +17,10 @@ title = "foot"; locked-title = "no"; - font = "valiosevka:size=14"; - font-bold = "valiosevka:size=14"; - # font = "Iosevka Nerd Font:size=14"; - # font-bold = "Iosevka Nerd Font:size=14"; + # font = "valiosevka:size=14"; + # font-bold = "valiosevka:size=14"; + font = "Iosevka Nerd Font:size=14"; + font-bold = "Iosevka Nerd Font:size=14"; line-height = 20; letter-spacing = 0; @@ -60,6 +60,9 @@ launch = "${pkgs.xdg-utils}/bin/xdg-open \${url}"; label-letters = "sadfjklewcmpgh"; osc8-underline = "always"; + protocols = "http, https, ftp, ftps, file, gemini, gopher, irc, ircs"; + uri-characters = '' + abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.,~:;/?#@!$&%*+="'()[]''; }; tweak = { diff --git a/packages/shell/starship.nix b/packages/shell/starship.nix index 9c0d3e3..fde1199 100644 --- a/packages/shell/starship.nix +++ b/packages/shell/starship.nix @@ -1,25 +1,38 @@ { add_newline = false; command_timeout = 2000; - format = "$hostname$username$directory$shell$nix_shell$jobs$character"; - scan_timeout = 1; + # format = "$hostname$username$directory$shell$nix_shell$git_branch$git_commit$git_state$git_status$jobs$cmd_duration\n$character"; + scan_timeout = 2; character = { - error_symbol = "[λ](bold red)"; - success_symbol = "[λ](bold green)"; + error_symbol = "[](bold red)"; + format = "$symbol [|](bold bright-black) "; + success_symbol = "[](bold green)"; + vicmd_symbol = "[](bold yellow)"; }; directory = { - format = "[](bold green) [$path]($style) "; + format = "[ ](bold green) [$path]($style) "; truncation_length = 2; }; - - direnv = { - disabled = false; + git_branch = { + style = "bold purple"; }; + git_commit.commit_hash_length = 7; git_status = { disabled = true; + ahead = "⇡ "; + behind = "⇣ "; + conflicted = " "; + deleted = "✘ "; + diverged = "⇆ "; + modified = "!"; + renamed = "»"; + staged = "+"; + stashed = "≡"; + style = "red"; + untracked = "?"; }; hostname = { @@ -28,12 +41,21 @@ ssh_only = true; }; + line_break.disabled = false; + c.symbol = "[ ](black)"; lua.symbol = "[ ](blue) "; + + golang.symbol = "[󰟓 ](blue)"; nix_shell.symbol = "[󱄅 ](blue) "; + nodejs.symbol = "[󰎙 ](yellow)"; + package.symbol = "📦 "; + python.symbol = "[ ](blue) "; + rust.symbol = "[ ](red) "; + username.format = "[$user]($style) in "; }