feat(shell): cleanup and switched to pure prompt

This commit is contained in:
2024-11-28 02:48:09 +02:00
parent 721fe614a7
commit 0f6157eb04
6 changed files with 117 additions and 100 deletions

48
config/zsh/antidote.zsh Executable file
View File

@@ -0,0 +1,48 @@
#!/usr/bin/env bash
# Setup antidote for Oh My Zsh
# vim: ft=zsh et sw=2 ts=2
[[ -z "$DOTFILES" ]] && DOTFILES="$HOME/.dotfiles"
[[ -z "$ANTIDOTE_DIR" ]] && ANTIDOTE_DIR="$DOTFILES/tools/antidote"
[[ -z "$ANTIDOTE_HOME" ]] && ANTIDOTE_HOME="$XDG_CACHE_HOME/antidote"
[[ -z "$ANTIDOTE_PLUGINS" ]] && ANTIDOTE_PLUGINS="$XDG_CONFIG_HOME/zsh/antidote_plugins"
[[ ! -d "$ANTIDOTE_DIR" ]] && {
git submodule add \
--name antidote \
--depth=1 \
-f https://github.com/mattmc3/antidote.git "${ANTIDOTE_DIR}"
git config -f .gitmodules submodule.antidote.shallow true
}
# Plugin configurations
zstyle ':antidote:bundle' use-friendly-names 'yes'
zstyle ':omz:update' mode reminder
zstyle ':omz:plugins:nvm' autoload yes
# Pure prompt settings
export PURE_PROMPT_SYMBOL='➜'
export PURE_GIT_UNTRACKED_DIRTY=0
zstyle ':prompt:pure:git:stash' show yes
zstyle ':prompt:pure:path' color white
zstyle ':prompt:pure:prompt:success' color green
zstyle ':prompt:pure:prompt:error' color red
# Disable ls colors to avoid issues with eza
export DISABLE_LS_COLORS=true
zstyle ':omz:plugins:eza' 'dirs-first' yes
zstyle ':omz:plugins:eza' 'git-status' yes
zstyle ':omz:plugins:eza' 'icons' yes
zstyle ':omz:plugins:eza' 'ls' yes
zstyle ':omz:plugins:eza' 'prompt' yes
[[ -f "${ANTIDOTE_PLUGINS}.txt" ]] || touch "${ANTIDOTE_PLUGINS}.txt"
FPATH="$ANTIDOTE_DIR/functions:$FPATH"
autoload -Uz antidote
if [[ ! "${ANTIDOTE_PLUGINS}.zsh" -nt "${ANTIDOTE_PLUGINS}.txt" ]]; then
antidote bundle <"${ANTIDOTE_PLUGINS}.txt" >|"${ANTIDOTE_PLUGINS}.zsh"
fi
# Source your static plugins file.
# shellcheck source=$HOME/.dotfiles/config/zsh/antidote_plugins.zsh
source "${ANTIDOTE_PLUGINS}.zsh"

View File

@@ -10,6 +10,10 @@ zsh-users/zsh-completions kind:fpath path:src
getantidote/use-omz # handle OMZ dependencies
ohmyzsh/ohmyzsh path:lib # load OMZ's library
# Use pure prompt
mafredri/zsh-async
sindresorhus/pure
ohmyzsh/ohmyzsh path:plugins/colored-man-pages
ohmyzsh/ohmyzsh path:plugins/brew
ohmyzsh/ohmyzsh path:plugins/extract
@@ -20,7 +24,6 @@ ohmyzsh/ohmyzsh path:plugins/golang
ohmyzsh/ohmyzsh path:plugins/gpg-agent
ohmyzsh/ohmyzsh path:plugins/nvm
ohmyzsh/ohmyzsh path:plugins/python
# ohmyzsh/ohmyzsh path:plugins/ssh-agent
ohmyzsh/ohmyzsh path:plugins/tmux
ohmyzsh/ohmyzsh path:plugins/z
@@ -35,4 +38,4 @@ jreese/zsh-titles
yuki-ycino/tms
# This needs to be last bundle
zsh-users/zsh-syntax-highlighting
# zsh-users/zsh-syntax-highlighting

57
config/zsh/prompt.zsh Executable file
View File

@@ -0,0 +1,57 @@
#!/usr/bin/env bash
# Setup prompt
# vim: ft=zsh:
setopt PROMPT_SUBST
# Setup vcs_info
autoload -Uz vcs_info
zstyle ':vcs_info:*' enable git
zstyle ':vcs_info:*' max-exports 2
zstyle ':vcs_info:*' check-for-changes true
zstyle ':vcs_info:*' check-for-staged-changes true
zstyle ':vcs_info:*' use-simple true
zstyle ':vcs_info:*' unstagedstr '%F{red}*' # display this when there are unstaged changes
zstyle ':vcs_info:*' stagedstr '%F{yellow}+' # display this when there are staged changes
zstyle ':vcs_info:*' formats '%F{5}%F{2}%b%c%u%F{5}%f '
zstyle ':vcs_info:*' actionformats '%F{5}%F{2}%b%F{3}|%F{1}%a%c%u%F{5}%f '
theme_precmd () {
vcs_info
}
export NL=$'\n'
# Set defaults for display.
# We want the host always, but only the user if we are in an SSH session or root.
P_HOST="%F{green}%m%f"
P_USER=''
# If we are in an SSH session, we want to show the username
[[ "$SSH_CONNECTION" != '' ]] && P_USER="%{${fg}[magenta]%}%n%f"
# If we are root, color the user name differently
[[ $UID -eq 0 ]] && P_USER="%{${fg}[red]%}%n%f"
# If P_USER is set, suffix user with @ giving us user@host
[[ -n "$P_USER" ]] && P_USER="$P_USER@"
# Combine the prompt parts. Could be just the host, or user@host.
P_PREFIX="$P_USER$P_HOST"
# Set the color of the current directory
P_DIR="%F{blue}%~%f"
# Change the color of the prompt if the last command failed
P_SHELL="%(?.%F{green}.%F{red})➜%f"
# Any extras we want to display
P_EXTRA=""
# Set the prompt
# user@host /path/to/current/dir (branch) ➜
export PROMPT="${P_PREFIX} ${P_DIR} %{$reset_color%}${vcs_info_msg_0_}%{$reset_color%}%{${P_EXTRA}%}${NL}${P_SHELL} "
autoload -U add-zsh-hook
add-zsh-hook precmd theme_precmd