theme: Add color palettes

.zshrc

@@ -10,6 +10,9 @@ export ZSH="$HOME/.oh-my-zsh"
 # See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
 ZSH_THEME="vulporuza"
 
+# Palettes: ~/.dotfiles/vulporuza-palettes.zsh
+VULPORUZA_PALETTE=vuru
+
 # Set list of themes to pick from when loading at random
 # Setting this variable when ZSH_THEME=random will cause zsh to load
 # a theme from this variable instead of looking in $ZSH/themes/
@@ -70,6 +73,7 @@ ZSH_THEME="vulporuza"
 # Add wisely, as too many plugins slow down shell startup.
 plugins=(
         gitfast
+        virtualenv
         zsh-syntax-highlighting
         zsh-autosuggestions
         # zsh-history-substring-search

auto-config-cli.sh

@@ -19,7 +19,7 @@ install_git_repo () {
 # Install packages
 sudo apt update
 sudo apt upgrade
-sudo apt install minicom ssh git tig ack tree npm cargo python3-pip curl zsh
+sudo apt install minicom ssh git tig ripgrep tree npm python3-pip curl zsh
 
 # Install Oh my ZSH
 sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
@@ -57,6 +57,7 @@ install_git_repo https://github.com/junegunn/fzf.git $HOME/.fzf
 $HOME/.fzf/install
 
 # Install navi
+curl https://sh.rustup.rs -sSf | sh
 cargo install navi
 mkdir -p $HOME/.local/share/navi/cheats
 ln -sfn $HOME/.dotfiles/navi/ $HOME/.local/share/navi/cheats/vulporuza

navi/compression.cheat

@@ -1,16 +1,34 @@
 % compression
 
 # Create a tar archive
-tar cf <name>.tar <files>
+tar -cvf <name>.tar <files>
+
+# Create a tar archive (gz compression)
+tar -cvzf <name>.tar.gz <files>
+
+# Create a tar archive (pigz compression)
+tar -I pigz -cvf <name>.tar.gz <files>
+
+# Create a tar archive (bzip2 compression)
+tar -cvjf <name>.tar.bz2 <files>
+
+# Create a tar archive (pbzip2 compression)
+tar -I pbzip2 -cvf <name>.tar.bz2 <files>
 
 # Extract a tar archive
-tar xf <tar_file>
+tar -xf <tar_file>
 
-# Create a tar archive with gz compression
-tar czf <name>.tar.gz <files>
+# Extract a tar (gz compression)
+tar -xzf <targz_file>
 
-# Extract a tar using gz compression
-tar xzf <targz_file>
+# Extract a tar (pigz compression)
+tar -I pigz -xf <targz_file>
+
+# Extract a tar (bzip2 compression)
+tar -xjf <tarbz2_file>
+
+# Extract a tar (pbzip2 compression)
+tar -I pbzip2 -xf <tarbz2_file>
 
 # Create a gz archive
 gzip -9 -c <files> > <name>.gz
@@ -21,4 +39,5 @@ gzip -d <gz_file>
 $ files: ls | awk -F: '{ print $1}'
 $ tar_file: ls *.tar | awk -F: '{ print $1}'
 $ targz_file: ls *.tar.gz | awk -F: '{ print $1}'
+$ tarbz2_file: ls *.tar.bz2 | awk -F: '{ print $1}'
 $ gz_file: ls *.gz | awk -F: '{ print $1}'

navi/docker-compose.cheat

@@ -1,5 +1,8 @@
 % docker-compose
 
+# Build a compose YAML
+sudo docker compose -f <file> build
+
 # Up a compose YAML
 sudo docker compose -f <file> up
 
@@ -12,10 +15,25 @@ sudo docker compose -f <file> up -d --force-recreate
 # Down a compose YAML
 sudo docker compose -f <file> down
 
-# Print the last lines of compose YAML logs
+# Execute command in a compose YAML
+sudo docker compose -f <file> exec <service> <command>
+
+# Print logs of a compose YAML
 sudo docker compose -f <file> logs --tail 100
 
-# Print the last lines of compose YAML logs and following its logs
+# Print service logs of a compose YAML
+sudo docker compose -f <file> logs --tail 100 <service>
+
+# Print and follow logs of a compose YAML
 sudo docker compose -f <file> logs --tail 100 -f
 
+# Print and follow service logs of a compose YAML
+sudo docker compose -f <file> logs --tail 100 -f <service>
+
+# Remove volume of a compose YAML
+sudo docker volume rm <dir>_<volume>
+
+$ dir: basename $PWD
 $ file: ls *.yaml | awk '{print $1}'
+$ volume: sudo docker compose -f <file> config --volumes | awk '{print $1}'
+$ service: sudo docker compose -f <file> config --services | awk '{print $1}'

navi/docker.cheat

@@ -3,24 +3,24 @@
 # Create a volume
 sudo docker volume create <name>
 
+# Remove a volume
+sudo docker volume rm <volume>
+
 # List all volumes
 sudo docker volume ls
 
-# Remove volume
-sudo docker volume rm <volume>
-
-$ volume: sudo docker volume ls --format "{{.Name}}" | awk '{print $1}'
+$ volume: sudo docker volume ls --format "{{.Name}}" | sort | awk '{print $1}'
 
 # Create new network
-docker network create <name>
+sudo docker network create <name>
 
-# List the networks
+# Remove network
+sudo docker network rm <network>
+
+# List all networks
 sudo docker network ls
 
-# Remove volume
-sudo docker volume rm <network>
-
-$ network: sudo docker network ls --format "{{.Name}}" | awk '{print $1}'
+$ network: sudo docker network ls --format "{{.Name}}" | sort | awk '{print $1}'
 
 # List the running containers
 sudo docker ps
@@ -43,4 +43,19 @@ sudo docker logs --tail 100 <container>
 # Print the last lines of a container's logs and following its logs
 sudo docker logs --tail 100 <container> -f
 
-$ container: sudo docker container ls --format "{{.Names}}" | awk '{print $1}'
+$ container: sudo docker container ls --format "{{.Names}}" | sort | awk '{print $1}'
+
+# List all images
+sudo docker image ls
+
+# Remove an image
+sudo docker image rm <image>
+
+# Save an image into an archive
+sudo docker image save <image> -o <name>
+
+# Load an image from an archive
+sudo docker image load -i <archive>
+
+$ image: sudo docker image ls --format "{{.Repository}}:{{.Tag}}" | sort | awk '{print $1}'
+$ archive: ls | awk '{print $1}'

navi/git.cheat

@@ -38,8 +38,8 @@ git push --set-upstream <remote_name> <branch_name>
 # Displays formatted log of commits for a repo
 git log --all --decorate --oneline --graph
 
-# Clear everything
-git clean -dxf
+# Clean everything
+git clean -fdx
 
 # Add a new module
 git submodule add <repository> <path>
@@ -67,5 +67,30 @@ git push origin <name>
 git tag -d <tag_name>
 git push -d origin <tag_name>
 
+# Create a patch from current full diff
+git diff > <patch_name>.patch
+
+# Create a patch from current file diff
+git diff <diff_file> > <patch_name>.patch
+
+# Create a patch from commit(s)
+git format-patch <first_commit>..<last_commit>
+
+# Show a diff patch
+git apply --stat <patch_name>
+
+# Check a diff patch
+git apply --check <patch_name>
+
+# Apply a diff patch
+git apply <patch_name>
+
+# Apply a commit patch
+git am <patch_name>
+
 # Variables
 $ tag_name: git tag -l | awk '{print $1}'
+$ diff_file: git diff --name-only | awk '{print $1}'
+$ first_commit: git log -n 20 --oneline | fzf --preview 'git show --color=always {1}' | awk '{print $1}'
+$ last_commit: git log -n 20 --oneline | fzf --preview 'git show --color=always {1}' | awk '{print $1}'
+$ patch_name: ls *.patch | awk '{print $1}'

navi/misc.cheat

@@ -54,12 +54,18 @@ meld <(hexdump -C <file_1>) <(hexdump -C <file_2>)
 # Compare 2 files (bcompare)
 bcompare <file_1> <file_2>
 
-# Replace expression in files
-ack -rl "<expression>" | xargs sed -i 's#<expression>#<replace_expression>#g'
+# Replace expression in files (ack)
+ack -rl '<expression>' | xargs sed -i 's#<expression>#<replace_expression>#g'
+
+# Replace expression in files (rg)
+rg -l '<expression>' | xargs sed -i 's#<expression>#<replace_expression>#g'
 
 # Disable Bluetooth ERTM
 sudo bash -c "echo Y > /sys/module/bluetooth/parameters/disable_ertm"
 
+# Show disk usage
+df -h
+
 $ user: cat /etc/passwd | awk -F: '{ print $1}'
 $ group: cat /etc/group | awk -F: '{ print $1}'
 $ interface: ip link | grep "^[0-9]*:" | sed "s/[0-9]*: \(.*\):.*/\1/" | awk -F: '{ print $1}'

vulporuza-palettes.zsh

@@ -0,0 +1,123 @@
+# vulporuza-palettes.zsh
+# Sourced by vulporuza.zsh-theme. Requires Oh My Zsh spectrum ($FG) and colors.
+#
+# Select one with VULPORUZA_PALETTE in ~/.zshrc (before Oh My Zsh):
+#   vuru | fox | frost | tokyo | quiet
+
+typeset -ga _vulporuza_keys
+_vulporuza_keys=(
+  dash path branch venv host dirty clean
+  staged conflicts changed untracked stashed
+  upstream state error
+)
+
+typeset -gA _vulporuza_p_vuru
+_vulporuza_p_vuru=(
+  dash      "$FG[240]"
+  path      "$FG[208]"
+  branch    "%{$fg_bold[magenta]%}"
+  venv      "$FG[075]"
+  host      "$FG[245]"
+  dirty     "$FG[075]"
+  clean     "$FG[034]"
+  staged    "%{$fg[red]%}"
+  conflicts "%{$fg[red]%}"
+  changed   "%{$fg[blue]%}"
+  untracked "%{$fg[cyan]%}"
+  stashed   "%{$fg_bold[blue]%}"
+  upstream  "%{$fg[blue]%}"
+  state     "%{$fg_bold[magenta]%}"
+  error     "%{$fg[red]%}"
+)
+
+typeset -gA _vulporuza_p_fox
+_vulporuza_p_fox=(
+  dash      "$FG[236]"
+  path      "$FG[166]"
+  branch    "$FG[180]"
+  venv      "$FG[073]"
+  host      "$FG[240]"
+  dirty     "$FG[172]"
+  clean     "$FG[107]"
+  staged    "$FG[167]"
+  conflicts "$FG[167]"
+  changed   "$FG[109]"
+  untracked "$FG[080]"
+  stashed   "$FG[110]"
+  upstream  "$FG[109]"
+  state     "$FG[180]"
+  error     "$FG[167]"
+)
+
+typeset -gA _vulporuza_p_frost
+_vulporuza_p_frost=(
+  dash      "$FG[237]"
+  path      "$FG[109]"
+  branch    "$FG[110]"
+  venv      "$FG[108]"
+  host      "$FG[243]"
+  dirty     "$FG[173]"
+  clean     "$FG[114]"
+  staged    "$FG[167]"
+  conflicts "$FG[167]"
+  changed   "$FG[109]"
+  untracked "$FG[080]"
+  stashed   "$FG[110]"
+  upstream  "$FG[110]"
+  state     "$FG[139]"
+  error     "$FG[167]"
+)
+
+typeset -gA _vulporuza_p_tokyo
+_vulporuza_p_tokyo=(
+  dash      "$FG[237]"
+  path      "$FG[111]"
+  branch    "$FG[141]"
+  venv      "$FG[080]"
+  host      "$FG[242]"
+  dirty     "$FG[215]"
+  clean     "$FG[114]"
+  staged    "$FG[167]"
+  conflicts "$FG[167]"
+  changed   "$FG[109]"
+  untracked "$FG[087]"
+  stashed   "$FG[110]"
+  upstream  "$FG[111]"
+  state     "$FG[141]"
+  error     "$FG[167]"
+)
+
+typeset -gA _vulporuza_p_quiet
+_vulporuza_p_quiet=(
+  dash      "$FG[238]"
+  path      "$FG[208]"
+  branch    "$FG[250]"
+  venv      "$FG[244]"
+  host      "$FG[240]"
+  dirty     "$FG[244]"
+  clean     "$FG[034]"
+  staged    "$FG[167]"
+  conflicts "$FG[167]"
+  changed   "$FG[109]"
+  untracked "$FG[080]"
+  stashed   "$FG[110]"
+  upstream  "$FG[244]"
+  state     "$FG[250]"
+  error     "$FG[167]"
+)
+
+_vulporuza_apply_palette() {
+  emulate -L zsh
+  local name=${VULPORUZA_PALETTE:-vuru}
+  if ! (( ${+parameters[_vulporuza_p_$name]} )); then
+    print -u2 "vulporuza: unknown VULPORUZA_PALETTE '${name}', using vuru"
+    name=vuru
+    VULPORUZA_PALETTE=vuru
+  fi
+  typeset -gA _vulporuza
+  _vulporuza=()
+  local key
+  for key in "${_vulporuza_keys[@]}"; do
+    eval "_vulporuza[\$key]=\${_vulporuza_p_${name}[\$key]}"
+  done
+}

vulporuza.zsh-theme

@@ -1,55 +1,80 @@
 # vulporuza.zsh-theme
+#
+# Palette: set VULPORUZA_PALETTE in ~/.zshrc before Oh My Zsh.
+# Definitions: vulporuza-palettes.zsh (same directory).
 
-typeset my_gray="$FG[240]"
+typeset _vulporuza_dir="${${(%):-%x}:A:h}"
+if ! source "${_vulporuza_dir}/vulporuza-palettes.zsh"; then
+  print -u2 "vulporuza: missing ${_vulporuza_dir}/vulporuza-palettes.zsh"
+  unset _vulporuza_dir
+  return
+fi
+unset _vulporuza_dir
+
+_vulporuza_apply_palette
+
+# Optional widgets: zsh-git-prompt and virtualenv plugin may be missing.
+if (( $+functions[git_super_status] )); then
+  _vulporuza_git='$(git_super_status)'
+else
+  _vulporuza_git='$(git_prompt_info)'
+fi
+
+if (( $+functions[virtualenv_prompt_info] )); then
+  _vulporuza_venv='$(virtualenv_prompt_info)'
+else
+  _vulporuza_venv=''
+fi
 
 # Primary prompt
-if  [ -z "${__GIT_PROMPT_DIR}" ]; then
-	PS1='$my_gray${(r:$COLUMNS::-:)}%{$reset_color%}╭ %T %{$FG[208]%}%~%{$reset_color%}$(git_prompt_info)
-╰ %(!.#.») '
-else
-	PS1='$my_gray${(r:$COLUMNS::-:)}%{$reset_color%}╭ %T %{$FG[208]%}%~%{$reset_color%}$(git_super_status)
-╰ %(!.#.») '
-fi
-PS2='%{$fg[red]%}\ %{$reset_color%}'
+PS1='${_vulporuza[dash]}${(r:$COLUMNS::-:)}%{$reset_color%}
+╭ %T ${_vulporuza[path]}%~%{$reset_color%}'$_vulporuza_git'
+╰'$_vulporuza_venv' %(!.#.») '
+
+PS2='${_vulporuza[error]}\ %{$reset_color%}'
+
+unset _vulporuza_git _vulporuza_venv
 
 # Right prompt
-RPS1='%(?..%{$fg[red]%}%? ↵%{$reset_color%}) $FG[245]%n@%m%{$reset_color%}%'
+RPS1='%(?..${_vulporuza[error]}%? ↵%{$reset_color%}) ${_vulporuza[host]}%n@%m%{$reset_color%}'
 
-# Git theme
+# Virtualenv (plugin virtualenv)
+ZSH_THEME_VIRTUALENV_PREFIX=" ${_vulporuza[venv]}("
+ZSH_THEME_VIRTUALENV_SUFFIX=")%{$reset_color%}"
+
+# Git: shared wrapper
 ZSH_THEME_GIT_PROMPT_PREFIX=" %{$reset_color%}["
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}]"
 
-if  [ -z "${__GIT_PROMPT_DIR}" ]; then
-	# git settings
-	ZSH_THEME_GIT_PROMPT_CLEAN="%{$reset_color%}|%{$FG[034]%}✔"
-	ZSH_THEME_GIT_PROMPT_DIRTY="%{$reset_color%}|%{$FG[075]%}…"
-else
+if (( $+functions[git_super_status] )); then
   ZSH_THEME_GIT_PROMPT_HASH_PREFIX=":"
   ZSH_THEME_GIT_PROMPT_SEPARATOR="|"
-	ZSH_THEME_GIT_PROMPT_BRANCH="%{$fg_bold[magenta]%}"
-	ZSH_THEME_GIT_PROMPT_STAGED="%{$fg[red]%}%{●%1G%}"
-	ZSH_THEME_GIT_PROMPT_CONFLICTS="%{$fg[red]%}%{✖%1G%}"
-	ZSH_THEME_GIT_PROMPT_CHANGED="%{$fg[blue]%}%{✚%1G%}"
+  ZSH_THEME_GIT_PROMPT_BRANCH="${_vulporuza[branch]}"
+  ZSH_THEME_GIT_PROMPT_STAGED="${_vulporuza[staged]}%{●%1G%}"
+  ZSH_THEME_GIT_PROMPT_CONFLICTS="${_vulporuza[conflicts]}%{✖%1G%}"
+  ZSH_THEME_GIT_PROMPT_CHANGED="${_vulporuza[changed]}%{✚%1G%}"
   ZSH_THEME_GIT_PROMPT_BEHIND="%{↓%1G%}"
   ZSH_THEME_GIT_PROMPT_AHEAD="%{↑%1G%}"
-	ZSH_THEME_GIT_PROMPT_STASHED="%{$fg_bold[blue]%}%{⚑%1G%}"
-	ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%}%{…%1G%}"
-	ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[green]%}%{✔%1G%}"
+  ZSH_THEME_GIT_PROMPT_STASHED="${_vulporuza[stashed]}%{⚑%1G%}"
+  ZSH_THEME_GIT_PROMPT_UNTRACKED="${_vulporuza[untracked]}%{…%1G%}"
+  ZSH_THEME_GIT_PROMPT_CLEAN="${_vulporuza[clean]}%{✔%1G%}"
   ZSH_THEME_GIT_PROMPT_LOCAL=" L"
-	# The remote branch will be shown between these two
-	ZSH_THEME_GIT_PROMPT_UPSTREAM_FRONT=" {%{$fg[blue]%}"
+  ZSH_THEME_GIT_PROMPT_UPSTREAM_FRONT=" {${_vulporuza[upstream]}"
   ZSH_THEME_GIT_PROMPT_UPSTREAM_END="%{${reset_color}%}}"
-	ZSH_THEME_GIT_PROMPT_MERGING="%{$fg_bold[magenta]%}|MERGING%{${reset_color}%}"
-	ZSH_THEME_GIT_PROMPT_REBASE="%{$fg_bold[magenta]%}|REBASE%{${reset_color}%} "
-	ZSH_THEME_GIT_PROMPT_BISECT="%{$fg_bold[magenta]%}|BISECT%{${reset_color}%} "
+  ZSH_THEME_GIT_PROMPT_MERGING="${_vulporuza[state]}|MERGING%{${reset_color}%}"
+  ZSH_THEME_GIT_PROMPT_REBASE="${_vulporuza[state]}|REBASE%{${reset_color}%} "
+  ZSH_THEME_GIT_PROMPT_BISECT="${_vulporuza[state]}|BISECT%{${reset_color}%} "
+else
+  ZSH_THEME_GIT_PROMPT_CLEAN="%{$reset_color%}|${_vulporuza[clean]}✔"
+  ZSH_THEME_GIT_PROMPT_DIRTY="%{$reset_color%}|${_vulporuza[dirty]}…"
 fi
 
 function theme_preexec {
-	print -nr $'\e]2;'"$USER@$(hostname) » $PWD » $1 $2"$'\a'
+  print -nr $'\e]2;'"$USER@$HOST » $PWD » $1"$'\a'
 }
 add-zsh-hook preexec theme_preexec
 
 function theme_precmd {
-	print -nr $'\e]2;'"$USER@$(hostname) » $PWD"$'\a'
+  print -nr $'\e]2;'"$USER@$HOST » $PWD"$'\a'
 }
 add-zsh-hook precmd theme_precmd