zsh improvements
This commit is contained in:
parent
26df8a5dc1
commit
7f1fb06614
2 changed files with 60 additions and 22 deletions
|
@ -27,6 +27,8 @@
|
||||||
watch
|
watch
|
||||||
curl
|
curl
|
||||||
android-tools
|
android-tools
|
||||||
|
imagemagick
|
||||||
|
rustup
|
||||||
];
|
];
|
||||||
|
|
||||||
home.file.".config/alacritty/alacritty.toml".source = ./alacritty.toml;
|
home.file.".config/alacritty/alacritty.toml".source = ./alacritty.toml;
|
||||||
|
|
|
@ -4,33 +4,32 @@ let
|
||||||
starshipConfig = {
|
starshipConfig = {
|
||||||
# based on https://starship.rs/presets/pastel-powerline.html
|
# based on https://starship.rs/presets/pastel-powerline.html
|
||||||
format =
|
format =
|
||||||
"$character" +
|
"[ алина 🌸](bg:#be15dc)[](#be15dc) " +
|
||||||
|
''''${env_var._NIX_SHELL_INFO}'' +
|
||||||
|
"$nix_shell" +
|
||||||
"$hostname" +
|
"$hostname" +
|
||||||
"[](fg:#be15dc bg:#FCA17D)" +
|
|
||||||
"$git_branch" +
|
"$git_branch" +
|
||||||
"$git_status" +
|
"$git_status" +
|
||||||
"[](fg:#FCA17D bg:#86BBD8)" +
|
|
||||||
"$nodejs" +
|
"$nodejs" +
|
||||||
"[](fg:#86BBD8 bg:#33658A)" +
|
"\n" +
|
||||||
"$directory" +
|
"$directory" +
|
||||||
"[ ](fg:#33658A)" +
|
"$character" +
|
||||||
"";
|
"";
|
||||||
add_newline = false;
|
add_newline = true;
|
||||||
|
|
||||||
character = {
|
character = {
|
||||||
success_symbol = "[](#be15dc)[ алина 🌸 ](bg:#be15dc)";
|
success_symbol = "[❱](#26dc15)";
|
||||||
error_symbol = "[](#dc156b)[ алина 🌸 ](bg:#be15dc)";
|
error_symbol = "[❱](#dc156b)";
|
||||||
format = "$symbol";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
hostname = {
|
hostname = {
|
||||||
style = ''bg:#be15dc'';
|
style = "bg:#a2d3f6 fg:black";
|
||||||
format = "[$hostname ]($style)";
|
format = "[](#a2d3f6)[ $hostname]($style)[](#a2d3f6) ";
|
||||||
ssh_only = true;
|
ssh_only = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
directory = {
|
directory = {
|
||||||
style = "bg:#33658A";
|
style = "blue";
|
||||||
format = "[$path ]($style)";
|
format = "[$path ]($style)";
|
||||||
truncation_length = 3;
|
truncation_length = 3;
|
||||||
truncation_symbol = "… /";
|
truncation_symbol = "… /";
|
||||||
|
@ -39,22 +38,27 @@ let
|
||||||
git_branch = {
|
git_branch = {
|
||||||
symbol = "";
|
symbol = "";
|
||||||
style = "bg:#FCA17D fg:black";
|
style = "bg:#FCA17D fg:black";
|
||||||
format = "[ $symbol $branch ]($style)";
|
format = "[](fg:#FCA17D)[$symbol $branch ]($style)";
|
||||||
};
|
};
|
||||||
git_status = {
|
git_status = {
|
||||||
style = "bg:#FCA17D fg:black";
|
style = "bg:#FCA17D fg:black";
|
||||||
format = "[$all_status$ahead_behind ]($style)";
|
format = "[$all_status$ahead_behind]($style)[](fg:#FCA17D) ";
|
||||||
|
};
|
||||||
|
|
||||||
|
nix_shell = {
|
||||||
|
style = "bg:#8ab3db fg:black";
|
||||||
|
format = "[](#8ab3db)[ $name]($style)[](#8ab3db) ";
|
||||||
|
};
|
||||||
|
|
||||||
|
env_var._NIX_SHELL_INFO = {
|
||||||
|
style = "bg:#8ab3db fg:black";
|
||||||
|
format = "[](#8ab3db)[ $env_value]($style)[](#8ab3db) ";
|
||||||
};
|
};
|
||||||
|
|
||||||
nodejs = {
|
nodejs = {
|
||||||
symbol = "";
|
style = "bg:#a1d886 fg:black";
|
||||||
style = "bg:#86BBD8 fg:black";
|
|
||||||
version_format = "$major.$minor";
|
version_format = "$major.$minor";
|
||||||
format = "[ $symbol ($version) ]($style)";
|
format = "[](#a1d886)[ $version]($style)[](#a1d886) ";
|
||||||
};
|
|
||||||
|
|
||||||
env_var._HOST_COLOR = {
|
|
||||||
format = "$env_value";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
|
@ -95,6 +99,22 @@ in {
|
||||||
COMPLETION_WAITING_DOTS="true"
|
COMPLETION_WAITING_DOTS="true"
|
||||||
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=5"
|
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=5"
|
||||||
|
|
||||||
|
# search in history with up and down arrow
|
||||||
|
autoload -U up-line-or-beginning-search
|
||||||
|
autoload -U down-line-or-beginning-search
|
||||||
|
zle -N up-line-or-beginning-search
|
||||||
|
zle -N down-line-or-beginning-search
|
||||||
|
bindkey "^[[A" up-line-or-beginning-search # Up
|
||||||
|
bindkey "^[[B" down-line-or-beginning-search # Down
|
||||||
|
|
||||||
|
WORDCHARS="*?_-.[]~=&;!#$%^"
|
||||||
|
|
||||||
|
# tab completion menu
|
||||||
|
autoload -Uz compinit
|
||||||
|
compinit
|
||||||
|
zstyle ':completion:*' menu select
|
||||||
|
|
||||||
|
|
||||||
if command -v micro &> /dev/null; then
|
if command -v micro &> /dev/null; then
|
||||||
export EDITOR="micro"
|
export EDITOR="micro"
|
||||||
elif command -v nano &> /dev/null; then
|
elif command -v nano &> /dev/null; then
|
||||||
|
@ -104,6 +124,22 @@ in {
|
||||||
if command -v fnm &> /dev/null; then
|
if command -v fnm &> /dev/null; then
|
||||||
eval "$(fnm env)"
|
eval "$(fnm env)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
function ns {
|
||||||
|
newargs=()
|
||||||
|
for arg in $@; do
|
||||||
|
# if doesn't start with - and doesn't contain # - assume its a nixpkgs package
|
||||||
|
if [[ $arg != -* && $arg != *#* ]]; then
|
||||||
|
newargs+=("nixpkgs#$arg")
|
||||||
|
else
|
||||||
|
newargs+=($arg)
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
_NIX_SHELL_INFO="''${newargs[@]}" nix shell "''${newargs[@]}"
|
||||||
|
}
|
||||||
|
|
||||||
|
export PATH="$HOME/.cargo/bin/:$PATH"
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue