Compare commits

...

2 commits

Author SHA1 Message Date
Evie Litherland-Smith 07be39befd 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
2024-04-02 17:32:56 +01:00
Evie Litherland-Smith 0667438150 Add back scripting languages commonly used
Restore python (with pylsp) and JS, remove gfortran from default
installed programming languages. Figured I would want scripting
languages on the fly but compiled languages will be focussed on a
project, so no issue having a nix-shell env.
2024-04-02 17:27:56 +01:00
4 changed files with 23 additions and 71 deletions

View file

@ -59,8 +59,8 @@
package = packages.${system}."iosevka-custom-nerdfont"; package = packages.${system}."iosevka-custom-nerdfont";
}; };
emoji = { emoji = {
name = "EmojiOne Color"; name = "Noto Color Emoji";
package = emojione; package = noto-fonts-emoji;
}; };
}; };
}; };

View file

@ -12,18 +12,23 @@
# Shell # Shell
shfmt shfmt
shellcheck shellcheck
nodePackages.prettier
# Lua # Lua
(luajit.withPackages (ps: [(ps.callPackage ./luarocks/scilua.nix {})])) (luajit.withPackages
(ps: [(ps.callPackage ./luarocks/scilua.nix {})]))
luarocks-nix luarocks-nix
lua-language-server lua-language-server
stylua stylua
# Python # Python
(python3.withPackages
(ps: with ps; [python-lsp-server mypy isort]))
ruff ruff
# Fortran # JavaScript / TypeScript
gfortran nodejs
fortls nodePackages.typescript-language-server
nodePackages.eslint
]; ];
} }

View file

@ -3,21 +3,19 @@
enable = true; enable = true;
enableTransience = true; enableTransience = true;
settings = { settings = {
c = {symbol = " ";};
command_timeout = 1000;
container = {symbol = " ";};
add_newline = false; add_newline = false;
character = { character = {
success_symbol = "[>](bold green)"; success_symbol = "[󰁔 ](bold green)";
error_symbol = "[>](bold red)"; error_symbol = "[󰁔 ](bold red)";
}; };
command_timeout = 2000;
container = {symbol = " ";};
directory = { directory = {
truncation_length = 2; truncation_length = 2;
fish_style_pwd_dir_length = 1; fish_style_pwd_dir_length = 1;
read_only = "󰉐 ";
truncate_to_repo = false; truncate_to_repo = false;
}; };
line_break.disabled = false; direnv = {disabled = false;};
git_branch = { git_branch = {
symbol = " "; symbol = " ";
only_attached = true; only_attached = true;
@ -28,7 +26,7 @@
tag_symbol = " "; tag_symbol = " ";
tag_disabled = false; tag_disabled = false;
}; };
git_metrics.disabled = false; git_metrics = {disabled = false;};
git_status = { git_status = {
stashed = " "; stashed = " ";
ahead = " "; ahead = " ";
@ -43,80 +41,29 @@
untracked = " "; untracked = " ";
typechanged = " "; typechanged = " ";
}; };
golang = {symbol = " ";};
guix_shell = {symbol = " ";};
haskell = {symbol = " ";};
hostname = { hostname = {
ssh_only = true; ssh_only = true;
ssh_symbol = "󰢹 "; ssh_symbol = "󰢹 ";
}; };
java = {symbol = " ";}; jobs = {symbol = "󰈏 ";};
line_break = {disabled = false;};
localip = {disabled = false;}; localip = {disabled = false;};
lua = {symbol = " ";}; memory_usage = {disabled = false;};
memory_usage = {
disabled = false;
symbol = " ";
};
nix_shell.symbol = "󱄅 ";
os = { os = {
disabled = false; disabled = false;
format = "on [$symbol]($style) "; 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 = {python_binary = "python3";};
python = {
symbol = "󰌠 ";
python_binary = "python3";
};
rust = {symbol = "󱘗 ";};
shell = { shell = {
disabled = false; disabled = false;
format = "using [$indicator ]($style)"; format = "using [$indicator ]($style)";
nu_indicator = "ν";
}; };
status = { status = {
disabled = false; disabled = false;
map_symbol = true; map_symbol = true;
pipestatus = true; pipestatus = true;
symbol = " ";
success_symbol = "";
not_executable_symbol = " ";
not_found_symbol = " ";
sigint_symbol = " ";
signal_symbol = " ";
};
sudo = {
disabled = false;
symbol = " ";
}; };
sudo = {disabled = false;};
}; };
}; };
} }

View file

@ -14,7 +14,7 @@ zle-line-init() {
local saved_prompt=$PROMPT local saved_prompt=$PROMPT
local saved_rprompt=$RPROMPT local saved_rprompt=$RPROMPT
PROMPT='> ' PROMPT='󰁔 '
RPROMPT='' RPROMPT=''
zle .reset-prompt zle .reset-prompt
PROMPT=$saved_prompt PROMPT=$saved_prompt