From f0e7628ab17f84fc76776b4bd19a6969c91815cb Mon Sep 17 00:00:00 2001 From: dish Date: Thu, 27 Feb 2025 23:29:47 -0500 Subject: [PATCH] [flake] update font configurations --- modules/home/programs/ghostty/settings.nix | 1 + modules/home/programs/starship/settings.nix | 46 +++++++++++---------- systems/x86_64-linux/zaphod/fonts.nix | 4 +- 3 files changed, 27 insertions(+), 24 deletions(-) diff --git a/modules/home/programs/ghostty/settings.nix b/modules/home/programs/ghostty/settings.nix index 58eaf46f..32aa7a04 100644 --- a/modules/home/programs/ghostty/settings.nix +++ b/modules/home/programs/ghostty/settings.nix @@ -4,6 +4,7 @@ font-family-italic = "BlexMono Nerd Font Italic"; font-family-bold-italic = "BlexMono Nerd Font Bold Italic"; font-size = 14; + font-codepoint-map = "U+E000-U+E00A,U+E0A0-U+E0A3,U+E0B0-U+E0C8,U+E0CA,U+E0CC-U+E0D7,U+E200-U+E2A9,U+E300-U+E3E3,U+E5FA-U+E6B7,U+E700-U+E8EF,U+EA60-U+EC1E,U+ED00-U+F2FF,U+EE00-U+EE0B,U+F300-U+F381,U+F400-U+F533,U+F0001-U+F1AF0=Symbols Nerd Font"; cursor-style = "block"; window-decoration = false; diff --git a/modules/home/programs/starship/settings.nix b/modules/home/programs/starship/settings.nix index 927bcdbf..db80f212 100644 --- a/modules/home/programs/starship/settings.nix +++ b/modules/home/programs/starship/settings.nix @@ -3,65 +3,68 @@ format = lib.concatStrings [ "$hostname" "$directory" - "$rust" "$python" - "$golang" + "$deno" "$nodejs" "$lua" "$git_branch" "$git_status" "$battery" "$shlvl" - " " "$character" ]; right_format = lib.concatStrings [ "$nix_shell" ]; directory = { - read_only = " "; + read_only = " "; }; git_branch = { symbol = " "; - format = "\\[[$symbol$branch]($style)\\]"; + format = "(\\[[$symbol$branch]($style)\\])"; }; git_status = { - format = "([\\[$all_status$ahead_behind\\]]($style))"; + format = "(\\[[$all_status$ahead_behind]($style)\\])"; }; - golang = { - symbol = " "; - format = "\\[[$symbol($version)]($style)\\]"; + deno = { + symbol = " "; + format = "(\\[[$symbol($version)]($style)\\])"; }; nodejs = { - format = "\\[[$symbol($version)]($style)\\]"; + format = "(\\[[$symbol($version)]($style)\\])"; + detect_files = [ + "package.json" + ".node-version" + ".nvmrc" + "!deno.json" + "!deno.lock" + ]; }; lua = { symbol = " "; - format = "\\[[\${symbol}\${version}]($style)\\]"; + format = "(\\[[$symbol($version)]($style)\\])"; }; package = { - symbol = " "; - format = "\\[[$symbol$version]($style)\\]"; + symbol = "󰏖 "; + format = "(\\[[$symbol$version]($style)\\])"; }; python = { symbol = " "; - format = "\\[[\${symbol}\${pyenv_prefix}(\${version})(\\($virtualenv\\))]($style)\\]"; - }; - rust = { - symbol = " "; - format = "\\[[$symbol($version)]($style)\\]"; + pyenv_version_name = false; + version_format = "v$major.$minor"; + format = "(\\[[$symbol($version)($virtualenv)]($style)\\])"; }; shlvl = { symbol = " "; + format = "(\\[[$symbol$shlvl]($style)\\])"; }; nix_shell = { symbol = " "; - format = "\\[[$symbol($name)]($style)\\]"; + format = "(\\[[$symbol($name)]($style)\\])"; }; aws.disabled = true; conda.disabled = true; crystal.disabled = true; dart.disabled = true; - deno.disabled = true; docker_context.disabled = true; dotnet.disabled = true; elixir.disabled = true; @@ -69,8 +72,8 @@ env_var.disabled = true; erlang.disabled = true; gcloud.disabled = true; + golang.disabled = true; helm.disabled = true; - hostname.disabled = true; java.disabled = true; jobs.disabled = true; julia.disabled = true; @@ -87,6 +90,7 @@ rlang.disabled = true; red.disabled = true; ruby.disabled = true; + rust.disabled = true; scala.disabled = true; singularity.disabled = true; swift.disabled = true; diff --git a/systems/x86_64-linux/zaphod/fonts.nix b/systems/x86_64-linux/zaphod/fonts.nix index 758ea953..9a64810b 100644 --- a/systems/x86_64-linux/zaphod/fonts.nix +++ b/systems/x86_64-linux/zaphod/fonts.nix @@ -16,10 +16,8 @@ }; packages = with pkgs; [ ibm-plex - nerd-fonts.fira-code - nerd-fonts.fira-mono nerd-fonts.blex-mono - nerd-fonts.jetbrains-mono + nerd-fonts.symbols-only ]; }; } -- 2.54.0