From 07be39befdddf0b200f8fc53f25d83c5198e5f0d Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Tue, 2 Apr 2024 17:32:56 +0100 Subject: [PATCH] Lots of starship config updates Remove language and OS custom icons, also some misc things like sudo, version, read-only dir, etc... to use defaults instead. Keep custom for git information and container indicator Add jobs with custom icon because the default has weird spacing Update zsh transient function so that transient prompt matches starship prompt Switch Emoji font back to Noto, some of starship config didn't display properly with EmojiOne --- flake.nix | 4 +-- home/starship/default.nix | 75 ++++++--------------------------------- home/zsh/transient.zsh | 2 +- 3 files changed, 14 insertions(+), 67 deletions(-) diff --git a/flake.nix b/flake.nix index ffcb8d58..af7e74ca 100644 --- a/flake.nix +++ b/flake.nix @@ -59,8 +59,8 @@ package = packages.${system}."iosevka-custom-nerdfont"; }; emoji = { - name = "EmojiOne Color"; - package = emojione; + name = "Noto Color Emoji"; + package = noto-fonts-emoji; }; }; }; diff --git a/home/starship/default.nix b/home/starship/default.nix index fa21de85..00458f9b 100644 --- a/home/starship/default.nix +++ b/home/starship/default.nix @@ -3,21 +3,19 @@ enable = true; enableTransience = true; settings = { - c = {symbol = " ";}; - command_timeout = 1000; - container = {symbol = " ";}; add_newline = false; character = { - success_symbol = "[>](bold green)"; - error_symbol = "[>](bold red)"; + success_symbol = "[󰁔 ](bold green)"; + error_symbol = "[󰁔 ](bold red)"; }; + command_timeout = 2000; + container = {symbol = " ";}; directory = { truncation_length = 2; fish_style_pwd_dir_length = 1; - read_only = "󰉐 "; truncate_to_repo = false; }; - line_break.disabled = false; + direnv = {disabled = false;}; git_branch = { symbol = " "; only_attached = true; @@ -28,7 +26,7 @@ tag_symbol = " "; tag_disabled = false; }; - git_metrics.disabled = false; + git_metrics = {disabled = false;}; git_status = { stashed = " "; ahead = " "; @@ -43,80 +41,29 @@ untracked = " "; typechanged = " "; }; - golang = {symbol = " ";}; - guix_shell = {symbol = " ";}; - haskell = {symbol = " ";}; hostname = { ssh_only = true; ssh_symbol = "󰢹 "; }; - java = {symbol = " ";}; + jobs = {symbol = "󰈏 ";}; + line_break = {disabled = false;}; localip = {disabled = false;}; - lua = {symbol = " ";}; - memory_usage = { - disabled = false; - symbol = " "; - }; - nix_shell.symbol = "󱄅 "; + memory_usage = {disabled = false;}; os = { disabled = false; format = "on [$symbol]($style) "; - style = "bold blue"; - symbols = { - Alpine = " "; - Android = " "; - Arch = " "; - CentOS = " "; - Debian = " "; - EndeavourOS = " "; - Fedora = " "; - FreeBSD = " "; - Gentoo = " "; - Illumos = " "; - Linux = " "; - Macos = " "; - Manjaro = " "; - Mint = "󰣭 "; - NixOS = " "; - OpenBSD = " "; - openSUSE = " "; - Pop = " "; - Raspbian = " "; - Redhat = " "; - RedHatEnterprise = " "; - Solus = " "; - SUSE = " "; - Ubuntu = " "; - Unknown = " "; - Windows = " "; - }; }; - package = {symbol = " ";}; - python = { - symbol = "󰌠 "; - python_binary = "python3"; - }; - rust = {symbol = "󱘗 ";}; + python = {python_binary = "python3";}; shell = { disabled = false; format = "using [$indicator ]($style)"; - nu_indicator = "ν"; }; status = { disabled = false; map_symbol = true; pipestatus = true; - symbol = " "; - success_symbol = ""; - not_executable_symbol = " "; - not_found_symbol = " "; - sigint_symbol = " "; - signal_symbol = " "; - }; - sudo = { - disabled = false; - symbol = " "; }; + sudo = {disabled = false;}; }; }; } diff --git a/home/zsh/transient.zsh b/home/zsh/transient.zsh index d01b945e..1f7bbd82 100755 --- a/home/zsh/transient.zsh +++ b/home/zsh/transient.zsh @@ -14,7 +14,7 @@ zle-line-init() { local saved_prompt=$PROMPT local saved_rprompt=$RPROMPT - PROMPT='> ' + PROMPT='󰁔 ' RPROMPT='' zle .reset-prompt PROMPT=$saved_prompt