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>
2026-02-25 17:38:47 +00:00
parent e7a2b3c10e
commit 8138d44c73
9 changed files with 54 additions and 53 deletions
--- a/home/.aliases
+++ b/home/.aliases
@@ -38,6 +38,8 @@ alias gl='git ld'
 alias ga='git a'
 alias gr='git r'
 alias gw='git show'
+alias gf='git f'
+alias gp='git p'
 gdm() { local base="${1:-$(git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null | sed 's@refs/remotes/origin/@@' || echo main)}"; git diff "${base}...HEAD"; }

 # fzf workflows
--- a/home/.config/bat/themes/dots.tmTheme
+++ b/home/.config/bat/themes/dots.tmTheme
@@ -178,7 +178,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#F40404</string>
+				<string>#F88C14</string>
 				<key>fontStyle</key>
 				<string>bold underline</string>
 			</dict>
--- a/home/.gitconfig
+++ b/home/.gitconfig
@@ -35,12 +35,12 @@
  hunk-header-decoration-style = none
  line-numbers-left-style = "#808080"
  line-numbers-right-style = "#808080"
-  line-numbers-minus-style = "#F40404"
+  line-numbers-minus-style = "#F88C14"
  line-numbers-plus-style = "#2CB494"
-  plus-style = syntax "#0c2a24"
-  plus-emph-style = syntax "#164a3c"
-  minus-style = syntax "#2a0a0a"
-  minus-emph-style = syntax "#3a1a1a"
+  plus-style = syntax "#0C2A24"
+  plus-emph-style = syntax "#164A3C"
+  minus-style = syntax "#2A1A0A"
+  minus-emph-style = syntax "#3A2A1A"

 [merge]
  conflictstyle = zdiff3
@@ -50,14 +50,14 @@

 [color "status"]
  added = "#2CB494"
-  changed = "#8787AF"
+  changed = "#7290B8"
  untracked = "#F88C14" italic
  branch = "#2CB494"
  header = "#CCE0D0"
 [color "diff"]
  meta = "#88409C"
  frag = "#4068D4"
-  old = "#F40404"
+  old = "#F88C14"
  new = "#2CB494"
  context = "#808080"
  commit = "#F88C14"
@@ -93,6 +93,8 @@
  cm = commit -m
  cam = commit -a -m
  m = commit --amend --verbose
+  f = fetch
+  p = pull
  st = stash
  sa = stash apply

--- a/home/.tmux.conf
+++ b/home/.tmux.conf
@@ -61,28 +61,28 @@ bind r source-file ~/.tmux.conf \; display "Config reloaded"
 # Status bar
 set -g status-position bottom
 set -g status-interval 1
-set -g status-style "fg=#728cb8,bg=default"
-set -g status-left "#{?client_prefix,#[fg=#2cb494]● ,#[fg=#3c3c3c]● }"
-set -g status-right "#(~/.tmux/network.sh) #[fg=#3c3c3c] #(~/.tmux/battery.sh) #[fg=#3c3c3c] #[fg=#808080]%a %d %b #[fg=#2cb494,bg=#1a1a1a] %H:%M #[default] "
+set -g status-style "fg=#7290B8,bg=default"
+set -g status-left "#{?client_prefix,#[fg=#2CB494]● ,#[fg=#3C3C3C]● }"
+set -g status-right "#(~/.tmux/network.sh) #[fg=#3C3C3C] #(~/.tmux/battery.sh) #[fg=#3C3C3C] #[fg=#808080]%a %d %b #[fg=#2CB494,bg=#1A1A1A] %H:%M #[default] "
 set -g status-right-length 80
-set -g window-status-format "#{?window_last_flag, #[fg=#1a7a64]#I#[fg=default] #W , #I #W }"
-set -g window-status-current-format " #[fg=#085040]#I#[fg=#0a0a0a] #W "
+set -g window-status-format "#{?window_last_flag, #[fg=#1A7A64]#I#[fg=default] #W , #I #W }"
+set -g window-status-current-format " #[fg=#085040]#I#[fg=#0A0A0A] #W "
 set -g window-status-separator " "
-set -g window-status-style "fg=#808080,bg=#1a1a1a"
-set -g window-status-current-style "fg=#0a0a0a,bg=#2cb494,bold"
-set -g window-status-bell-style "fg=#1a1a1a,bg=#f88c14,bold"
+set -g window-status-style "fg=#808080,bg=#1A1A1A"
+set -g window-status-current-style "fg=#0A0A0A,bg=#2CB494,bold"
+set -g window-status-bell-style "fg=#1A1A1A,bg=#F88C14,bold"
 set -g monitor-bell on
 set -g visual-bell off
-set -g pane-border-style "fg=#3c3c3c"
-set -g pane-active-border-style "fg=#2cb494"
-set -g message-style "fg=#2cb494,bg=default"
-set -g message-command-style "fg=#f88c14,bg=default"
-set -g mode-style "fg=#1a1a1a,bg=#f88c14,bold"
+set -g pane-border-style "fg=#3C3C3C"
+set -g pane-active-border-style "fg=#2CB494"
+set -g message-style "fg=#2CB494,bg=default"
+set -g message-command-style "fg=#F88C14,bg=default"
+set -g mode-style "fg=#1A1A1A,bg=#F88C14,bold"
 set -g display-panes-colour "#808080"
-set -g display-panes-active-colour "#2cb494"
+set -g display-panes-active-colour "#2CB494"

 # Clock
-set -g clock-mode-colour "#2cb494"
+set -g clock-mode-colour "#2CB494"
 set -g automatic-rename on
 set -g allow-rename off
 set -g automatic-rename-format '#(~/.tmux/tab-name.sh "#{pane_current_command}" "#{b:pane_current_path}")'
--- a/home/.tmux/battery.sh
+++ b/home/.tmux/battery.sh
@@ -27,9 +27,9 @@ if [[ -n "$full" ]]; then
 elif [[ -n "$charging" ]]; then
    echo "#[fg=#808080]󰂄 ${pct}%#[default]"
 elif (( pct <= 10 )); then
-    echo "#[fg=#F40404,bold]󰂎 ${pct}%#[default]"
+    echo "#[fg=#F88C14,bold]󰂎 ${pct}%#[default]"
 elif (( pct <= 20 )); then
-    echo "#[fg=#f88c14,bold]󰁺 ${pct}%#[default]"
+    echo "#[fg=#F88C14,bold]󰁺 ${pct}%#[default]"
 elif (( pct <= 40 )); then
    echo "#[fg=#808080]󰁼 ${pct}%#[default]"
 elif (( pct <= 60 )); then
--- a/home/.tmux/network.sh
+++ b/home/.tmux/network.sh
@@ -42,13 +42,13 @@ else
 fi

 if [[ -z "$ms" ]]; then
-    result="#[fg=#F40404]󰤭 --#[default]"
+    result="#[fg=#F88C14]󰤭 --#[default]"
 elif (( ms <= 50 )); then
    result="#[fg=#808080]${icon} ${ms}ms#[default]"
 elif (( ms <= 150 )); then
-    result="#[fg=#f88c14]${icon} ${ms}ms#[default]"
+    result="#[fg=#F88C14]${icon} ${ms}ms#[default]"
 else
-    result="#[fg=#F40404]${icon} ${ms}ms#[default]"
+    result="#[fg=#F88C14]${icon} ${ms}ms#[default]"
 fi

 echo "$result" | tee "$cache"
--- a/home/.vimrc
+++ b/home/.vimrc
@@ -89,19 +89,19 @@ highlight Keyword guifg=#4068D4
 highlight Type guifg=#2CB494
 highlight Special guifg=#88409C
 highlight PreProc guifg=#F88C14
-highlight Error guifg=#F40404 guibg=NONE gui=bold,underline
+highlight Error guifg=#F88C14 guibg=NONE gui=bold,underline
 highlight Todo guifg=#FCFC38 guibg=NONE gui=bold

 highlight Search guifg=#3C3C3C guibg=#FCFC38
 highlight IncSearch guifg=#3C3C3C guibg=#F88C14

 highlight DiffAdd guifg=#2CB494 guibg=#0A2A1A gui=NONE
-highlight DiffDelete guifg=#F40404 guibg=#2A0A0A gui=NONE
+highlight DiffDelete guifg=#F88C14 guibg=#2A1A0A gui=NONE
 highlight DiffChange guifg=#4068D4 guibg=#0A1A2A gui=NONE
 highlight DiffText guifg=#CCE0D0 guibg=#1A2A3A gui=bold

 highlight diffAdded guifg=#2CB494 gui=bold
-highlight diffRemoved guifg=#F40404 gui=bold
+highlight diffRemoved guifg=#F88C14 gui=bold
 highlight diffFile guifg=#7290B8 gui=bold
 highlight diffIndexLine guifg=#88409C
 highlight diffLine guifg=#00E4FC
@@ -135,9 +135,9 @@ highlight CursorColumn guibg=#0A2A1A
 highlight SignColumn guifg=#808080 guibg=NONE
 highlight GitGutterAdd guifg=#2CB494 guibg=NONE
 highlight GitGutterChange guifg=#4068D4 guibg=NONE
-highlight GitGutterDelete guifg=#F40404 guibg=NONE
+highlight GitGutterDelete guifg=#F88C14 guibg=NONE
 highlight WarningMsg guifg=#FCFC38
-highlight ErrorMsg guifg=#F40404 gui=bold
+highlight ErrorMsg guifg=#F88C14 gui=bold
 highlight ModeMsg guifg=#CCE0D0 gui=bold
 highlight MoreMsg guifg=#2CB494
 highlight Question guifg=#2CB494
@@ -155,7 +155,7 @@ highlight Conditional guifg=#4068D4
 highlight Repeat guifg=#4068D4
 highlight Label guifg=#88409C
 highlight Operator guifg=#CCE0D0
-highlight Exception guifg=#F40404
+highlight Exception guifg=#F88C14
 highlight Include guifg=#F88C14
 highlight Define guifg=#F88C14
 highlight Macro guifg=#F88C14
--- a/home/.zsh/prompt.zsh
+++ b/home/.zsh/prompt.zsh
@@ -15,7 +15,6 @@ _dots_init_colors() {
            teal      $'%{\e[38;2;44;180;148m%}'
            teal_bg   $'%{\e[48;2;44;180;148m%}'
            orange    $'%{\e[38;2;248;140;20m%}'
-            red       $'%{\e[38;2;244;4;4m%}'
            grey      $'%{\e[38;2;114;144;184m%}'
            grey_bg   $'%{\e[48;2;114;144;184m%}'
            purple    $'%{\e[38;2;136;64;156m%}'
@@ -29,7 +28,6 @@ _dots_init_colors() {
            teal      $'%{\e[38;5;43m%}'
            teal_bg   $'%{\e[48;5;43m%}'
            orange    $'%{\e[38;5;208m%}'
-            red       $'%{\e[38;5;196m%}'
            grey      $'%{\e[38;5;103m%}'
            grey_bg   $'%{\e[48;5;103m%}'
            purple    $'%{\e[38;5;133m%}'
@@ -43,7 +41,6 @@ _dots_init_colors() {
            teal      $'%{\e[36m%}'
            teal_bg   $'%{\e[46m%}'
            orange    $'%{\e[33m%}'
-            red       $'%{\e[31m%}'
            grey      $'%{\e[34m%}'
            grey_bg   $'%{\e[44m%}'
            purple    $'%{\e[35m%}'
@@ -264,7 +261,7 @@ _dots_precmd() {
        fi
    fi
    
-    (( e )) && rp_parts+=("${_dots_pc[red]}[${e}]${_dots_pc[reset]}")
+    (( e )) && rp_parts+=("${_dots_pc[orange]}[${e}]${_dots_pc[reset]}")
    
    local session="$(_dots_session)"
    [[ -n "$session" ]] && rp_parts+=("${_dots_pc[dark_bg]}${_dots_pc[dark]}[${_dots_pc[orange]}${session}${_dots_pc[reset]}${_dots_pc[dark_bg]}${_dots_pc[dark]}]${_dots_pc[reset]}")
--- a/home/.zshrc
+++ b/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)