Replace red with amber, unify palette, add fetch/pull aliases
- Add git aliases: f (fetch), p (pull) and shell aliases: gf, gp - Replace all #F40404 (red) with #F88C14 (amber) across prompt, gitconfig, vim, bat theme, and tmux scripts for colourblind-friendly palette - Standardise hex case to uppercase throughout - Unify #728cb8 → #7290B8 (fix blue inconsistency) - Replace unique #8787AF with palette #7290B8 in gitconfig - Remove unused red colour definition from prompt.zsh - Update dark diff backgrounds from red-tinted to amber-tinted Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
30
home/.zshrc
30
home/.zshrc
@@ -62,7 +62,7 @@ _dots_init_completion() {
|
||||
zstyle ':completion:*' list-colors "${(s.:.)LS_COLORS}"
|
||||
zstyle ':completion:*' group-name ''
|
||||
zstyle ':completion:*:descriptions' format $'\e[38;2;114;144;184m-- %d --\e[0m'
|
||||
zstyle ':completion:*:warnings' format $'\e[38;2;244;4;4m-- no matches --\e[0m'
|
||||
zstyle ':completion:*:warnings' format $'\e[38;2;248;140;20m-- no matches --\e[0m'
|
||||
zstyle ':completion:*' matcher-list 'm:{a-z}={A-Z}'
|
||||
}
|
||||
_dots_init_completion
|
||||
@@ -73,7 +73,7 @@ _dots_load_plugins() {
|
||||
[[ -f "$f" ]] && source "$f"
|
||||
|
||||
# Autosuggestion ghost text colour
|
||||
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=#3c3c3c'
|
||||
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=#3C3C3C'
|
||||
|
||||
# syntax-highlighting must be sourced last
|
||||
f="$plugin_dir/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"
|
||||
@@ -81,22 +81,22 @@ _dots_load_plugins() {
|
||||
|
||||
# Syntax highlighting theme
|
||||
typeset -gA ZSH_HIGHLIGHT_STYLES
|
||||
ZSH_HIGHLIGHT_STYLES[command]='fg=#2cb494'
|
||||
ZSH_HIGHLIGHT_STYLES[builtin]='fg=#2cb494'
|
||||
ZSH_HIGHLIGHT_STYLES[alias]='fg=#2cb494'
|
||||
ZSH_HIGHLIGHT_STYLES[function]='fg=#2cb494'
|
||||
ZSH_HIGHLIGHT_STYLES[unknown-token]='fg=#f40404'
|
||||
ZSH_HIGHLIGHT_STYLES[command]='fg=#2CB494'
|
||||
ZSH_HIGHLIGHT_STYLES[builtin]='fg=#2CB494'
|
||||
ZSH_HIGHLIGHT_STYLES[alias]='fg=#2CB494'
|
||||
ZSH_HIGHLIGHT_STYLES[function]='fg=#2CB494'
|
||||
ZSH_HIGHLIGHT_STYLES[unknown-token]='fg=#F88C14'
|
||||
ZSH_HIGHLIGHT_STYLES[path]='underline'
|
||||
ZSH_HIGHLIGHT_STYLES[globbing]='fg=#f88c14'
|
||||
ZSH_HIGHLIGHT_STYLES[single-quoted-argument]='fg=#728cb8'
|
||||
ZSH_HIGHLIGHT_STYLES[double-quoted-argument]='fg=#728cb8'
|
||||
ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument]='fg=#728cb8'
|
||||
ZSH_HIGHLIGHT_STYLES[globbing]='fg=#F88C14'
|
||||
ZSH_HIGHLIGHT_STYLES[single-quoted-argument]='fg=#7290B8'
|
||||
ZSH_HIGHLIGHT_STYLES[double-quoted-argument]='fg=#7290B8'
|
||||
ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument]='fg=#7290B8'
|
||||
ZSH_HIGHLIGHT_STYLES[comment]='fg=#808080'
|
||||
ZSH_HIGHLIGHT_STYLES[arg0]='fg=#2cb494'
|
||||
ZSH_HIGHLIGHT_STYLES[arg0]='fg=#2CB494'
|
||||
ZSH_HIGHLIGHT_STYLES[default]='fg=#CCE0D0'
|
||||
ZSH_HIGHLIGHT_STYLES[commandseparator]='fg=#808080'
|
||||
ZSH_HIGHLIGHT_STYLES[redirection]='fg=#f88c14'
|
||||
ZSH_HIGHLIGHT_STYLES[option]='fg=#7290b8'
|
||||
ZSH_HIGHLIGHT_STYLES[redirection]='fg=#F88C14'
|
||||
ZSH_HIGHLIGHT_STYLES[option]='fg=#7290B8'
|
||||
}
|
||||
_dots_load_plugins
|
||||
|
||||
@@ -117,7 +117,7 @@ _dots_load_fzf() {
|
||||
command -v fzf &>/dev/null || return
|
||||
export FZF_DEFAULT_COMMAND='rg --files --hidden --glob "!.git"'
|
||||
export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
|
||||
export FZF_DEFAULT_OPTS='--style=minimal --layout=reverse --height=40% --border=none --no-scrollbar --prompt="> " --info=inline-right --no-separator --margin=1,0,0,0 --color=fg:#808080,fg+:#CCE0D0,bg:-1,bg+:#1a1a1a --color=hl:#2cb494,hl+:#2cb494,info:#808080,marker:#2cb494 --color=prompt:#2cb494,spinner:#88409C,pointer:#2cb494,header:#808080 --color=border:#3c3c3c,preview-border:#3c3c3c,gutter:#1a1a1a,preview-fg:#CCE0D0'
|
||||
export FZF_DEFAULT_OPTS='--style=minimal --layout=reverse --height=40% --border=none --no-scrollbar --prompt="> " --info=inline-right --no-separator --margin=1,0,0,0 --color=fg:#808080,fg+:#CCE0D0,bg:-1,bg+:#1A1A1A --color=hl:#2CB494,hl+:#2CB494,info:#808080,marker:#2CB494 --color=prompt:#2CB494,spinner:#88409C,pointer:#2CB494,header:#808080 --color=border:#3C3C3C,preview-border:#3C3C3C,gutter:#1A1A1A,preview-fg:#CCE0D0'
|
||||
# fzf --zsh requires v0.48+
|
||||
if fzf --zsh &>/dev/null; then
|
||||
source <(fzf --zsh)
|
||||
|
||||
Reference in New Issue
Block a user