From 427c7b3cf2b0500276bafaedd8d14ea3263e33bb Mon Sep 17 00:00:00 2001 From: James Dixon Date: Thu, 7 Nov 2024 16:35:44 -0500 Subject: [PATCH] run zshrc through shfmt, comment prompt line --- config/zsh/.zshrc | 276 +++++++++++++++++++++++----------------------- 1 file changed, 135 insertions(+), 141 deletions(-) diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc index 48d6d44..8c15ae4 100644 --- a/config/zsh/.zshrc +++ b/config/zsh/.zshrc @@ -2,16 +2,16 @@ # This file is kept under git version control -# To make any local (non-tracked) edits or configurations, +# To make any local (non-tracked) edits or configurations, # please edit `~/.local/.zshrc`, which is sourced from this file. # ls and grep options ls --version &>/dev/null if [ $? -eq 0 ]; then - LS_OPTS="--color --group-directories-first -F" + LS_OPTS="--color --group-directories-first -F" else - LS_OPTS="-GF" - export CLICOLOR=1 + LS_OPTS="-GF" + export CLICOLOR=1 fi export GREP_OPTS="--color=auto" @@ -25,7 +25,7 @@ export HISTSIZE=999999999 export SAVEHIST=$HISTSIZE # * * * * * * * * * -## Shell Options * +# Shell Options * # * * * * * * * * * # Setting options @@ -36,7 +36,7 @@ setopt share_history setopt histsavenodups setopt hist_ignore_all_dups setopt interactive_comments -setopt auto_menu # tab completion +setopt auto_menu # tab completion setopt prompt_subst # command substitution in prompt unsetopt correct_all autoload -Uz compinit && compinit @@ -49,10 +49,10 @@ bindkey -e bindkey '\e[3~' delete-char bindkey '^p' history-search-backward bindkey '^n' history-search-forward -bindkey ' ' magic-space +bindkey ' ' magic-space # * * * * * * -## Aliases * +# Aliases * # * * * * * * # core utils @@ -72,13 +72,13 @@ alias pathls='printf "%b\n" "${PATH//:/\\n}"' # git - vim - tmux alias g="git" -alias groot="cd $(git rev-parse --show-toplevel 2> /dev/null || echo -n ".")" +alias groot="cd $(git rev-parse --show-toplevel 2>/dev/null || echo -n ".")" alias v="$EDITOR" alias vi="$EDITOR" alias tmls="tmux ls" alias tmlsc="tmux lsc" alias tmks="tmux kill-session -t" # kill one session -alias tmka="tmux kill-server" # aka killall +alias tmka="tmux kill-server" # aka killall # python alias py="python3" @@ -102,114 +102,109 @@ touchx() { touch "$@" && chmod +x "$@"; } # git lazygit() { - git commit -a -m "$*" && git push; + git commit -a -m "$*" && git push } lg() { - lazygit "$*"; -} - -# vim -swp_vimrc(){ - mv ~/.vim/vimrc ~/.vim/vimrc.swp - mv ~/.vim/vimrc.min ~/.vim/vimrc - mv ~/.vim/vimrc.swp ~/.vim/vimrc.min + lazygit "$*" } # tmux tm() { - if [ "$#" -gt 0 ]; then - tmux new-session -As "$1" - else - tmux new-session - fi + if [ "$#" -gt 0 ]; then + tmux new-session -As "$1" + else + tmux new-session + fi } tma() { - if [ "$#" -gt 0 ]; then - tmux attach-session -d -t "$1" - if [ "$?" -ne 0 ]; then - tmux new-session -As "$1" - fi - else - tmux attach - fi + if [ "$#" -gt 0 ]; then + tmux attach-session -d -t "$1" + if [ "$?" -ne 0 ]; then + tmux new-session -As "$1" + fi + else + tmux attach + fi } # misc functions -colordump(){ - for i in $(seq 0 255); do printf "$(tput setaf $i)$i "; done +colordump() { + for i in $(seq 0 255); do printf "$(tput setaf $i)$i "; done } # "smart" extract function extract() { - if [ -z "$1" ]; then - # display usage if no parameters given - echo "Usage: extract ." - echo " extract [path/file_name_2.ext] [path/file_name_3.ext]" - return 1 - else - for n in "$@"; do - if [ -f "$n" ] ; then - case "${n%,}" in - *.tar.bz2|*.tar.gz|*.tar.xz|*.tbz2|*.tgz|*.txz|*.tar) - tar xvf "$n" ;; - *.lzma) unlzma ./"$n" ;; - *.bz2) bunzip2 ./"$n" ;; - *.rar) unrar x -ad ./"$n" ;; - *.gz) gunzip ./"$n" ;; - *.zip) unzip ./"$n" ;; - *.z) uncompress ./"$n" ;; - *.7z|*.arj|*.cab|*.chm|*.deb|*.dmg|*.iso|*.lzh|*.msi|*.rpm|*.udf|*.wim|*.xar) - 7z x ./"$n" ;; - *.xz) unxz ./"$n" ;; - *.exe) cabextract ./"$n" ;; - *) - echo "extract: '$n' - unknown archive method" - return 1 - ;; - esac - else - echo "'$n' - file does not exist" - return 1 - fi - done - fi + if [ -z "$1" ]; then + # display usage if no parameters given + echo "Usage: extract ." + echo " extract [path/file_name_2.ext] [path/file_name_3.ext]" + return 1 + else + for n in "$@"; do + if [ -f "$n" ]; then + case "${n%,}" in + *.tar.bz2 | *.tar.gz | *.tar.xz | *.tbz2 | *.tgz | *.txz | *.tar) + tar xvf "$n" + ;; + *.lzma) unlzma ./"$n" ;; + *.bz2) bunzip2 ./"$n" ;; + *.rar) unrar x -ad ./"$n" ;; + *.gz) gunzip ./"$n" ;; + *.zip) unzip ./"$n" ;; + *.z) uncompress ./"$n" ;; + *.7z | *.arj | *.cab | *.chm | *.deb | *.dmg | *.iso | *.lzh | *.msi | *.rpm | *.udf | *.wim | *.xar) + 7z x ./"$n" + ;; + *.xz) unxz ./"$n" ;; + *.exe) cabextract ./"$n" ;; + *) + echo "extract: '$n' - unknown archive method" + return 1 + ;; + esac + else + echo "'$n' - file does not exist" + return 1 + fi + done + fi } bkup() { - if [ -f "$1" ]; then - cp "${1}" "${1}.bkup.$(date +'%F.%R')"; - fi + if [ -f "$1" ]; then + cp "${1}" "${1}.bkup.$(date +'%F.%R')" + fi } datauri() { - local mimeType="" - if [ -f "$1" ]; then - mimeType=$(file -b --mime-type "$1") + local mimeType="" + if [ -f "$1" ]; then + mimeType=$(file -b --mime-type "$1") - if [[ $mimeType == text/* ]]; then - mimeType="$mimeType;charset=utf-8" - fi + if [[ $mimeType == text/* ]]; then + mimeType="$mimeType;charset=utf-8" + fi - printf "data:%s;base64,%s" \ - "$mimeType" \ - "$(openssl base64 -in "$1" | tr -d "\n")" - else - printf "%s is not a file.\n" "$1" - fi + printf "data:%s;base64,%s" \ + "$mimeType" \ + "$(openssl base64 -in "$1" | tr -d "\n")" + else + printf "%s is not a file.\n" "$1" + fi } # grep with color into less -grepless(){ - grep -ir --color=always "$*" --exclude-dir=".git" --exclude-dir="node_modules" . | less -RX +grepless() { + grep -ir --color=always "$*" --exclude-dir=".git" --exclude-dir="node_modules" . | less -RX } # curl shortcuts cheatsh() { - curl cheat.sh/"$1" + curl cheat.sh/"$1" } watip() { - curl ifconfig.co - # dig +short myip.opendns.com @resolver1.opendns.com + curl ifconfig.co + # dig +short myip.opendns.com @resolver1.opendns.com } # * * * * * * * * * * * * @@ -220,95 +215,94 @@ watip() { # PROMPT='%n@%m %~ %# ' git_prompt() { - BRANCH=$(git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/*\(.*\)/\1/') - STATUS="$(git status 2> /dev/null)" + BRANCH=$(git branch 2>/dev/null | sed -e '/^[^*]/d' -e 's/*\(.*\)/\1/') + STATUS="$(git status 2>/dev/null)" - if [[ "$?" -ne 0 ]]; then - return - fi + if [[ "$?" -ne 0 ]]; then + return + fi - if [ ! -z $BRANCH ]; then - printf "%s" "%F{reset}%F{yellow}$BRANCH" - printf "%s" "%F{reset}[" - if echo "${STATUS}" | grep -c "nothing to commit" &> /dev/null; then printf "%s" "%F{blue}="; fi - if echo "${STATUS}" | grep -c "renamed:" &> /dev/null; then printf "%s" "%F{red}%"; fi - if echo "${STATUS}" | grep -c "deleted:" &> /dev/null; then printf "%s" "%F{red}-"; fi - if echo "${STATUS}" | grep -c "new file:" &> /dev/null; then printf "%s" "%F{green}+"; fi - if echo "${STATUS}" | grep -c "branch is ahead:" &> /dev/null; then printf "%s" "%F{yellow}>"; fi - if echo "${STATUS}" | grep -c "branch is behind" &> /dev/null; then printf "%s" "%F{yellow}<"; fi - if echo "${STATUS}" | grep -c "Untracked files:" &> /dev/null; then printf "%s" "%F{yellow}?"; fi - if echo "${STATUS}" | grep -c "Changes not staged for commit:" &> /dev/null; then printf "%s" "%F{red}*"; fi - if echo "${STATUS}" | grep -c "Changes to be committed:" &> /dev/null; then printf "%s" "%F{green}="; fi - printf "%s" "%F{reset}]" - fi + if [ ! -z $BRANCH ]; then + printf "%s" "%F{reset}%F{yellow}$BRANCH" + printf "%s" "%F{reset}[" + if echo "${STATUS}" | grep -c "nothing to commit" &>/dev/null; then printf "%s" "%F{blue}="; fi + if echo "${STATUS}" | grep -c "renamed:" &>/dev/null; then printf "%s" "%F{red}%"; fi + if echo "${STATUS}" | grep -c "deleted:" &>/dev/null; then printf "%s" "%F{red}-"; fi + if echo "${STATUS}" | grep -c "new file:" &>/dev/null; then printf "%s" "%F{green}+"; fi + if echo "${STATUS}" | grep -c "branch is ahead:" &>/dev/null; then printf "%s" "%F{yellow}>"; fi + if echo "${STATUS}" | grep -c "branch is behind" &>/dev/null; then printf "%s" "%F{yellow}<"; fi + if echo "${STATUS}" | grep -c "Untracked files:" &>/dev/null; then printf "%s" "%F{yellow}?"; fi + if echo "${STATUS}" | grep -c "Changes not staged for commit:" &>/dev/null; then printf "%s" "%F{red}*"; fi + if echo "${STATUS}" | grep -c "Changes to be committed:" &>/dev/null; then printf "%s" "%F{green}="; fi + printf "%s" "%F{reset}]" + fi } -PROMPT='%F{blue}%~$(git_prompt) %F{yellow}%# %F{reset}' +# PROMPT='%F{blue}%~$(git_prompt) %F{green}%# %F{reset}' # * * * * * * * * * * * * * * * * * * * # Language Specific Version Managers * # * * * * * * * * * * * * * * * * * * * # rbenv (ruby) -src_rbenv(){ - if command -v ruby > /dev/null && command -v gem > /dev/null; then - path+=("$(ruby -r rubygems -e 'puts Gem.user_dir')/bin") - # rbenv shim - if [ -d "$HOME/.rbenv/bin" ]; then - path+=("$HOME/.rbenv/bin") - [[ ":$PATH:" != *":$HOME/.rbenv/shims:"* ]] && eval "$(rbenv init - zsh)" - fi - fi +src_rbenv() { + if command -v ruby >/dev/null && command -v gem >/dev/null; then + path+=("$(ruby -r rubygems -e 'puts Gem.user_dir')/bin") + # rbenv shim + if [ -d "$HOME/.rbenv/bin" ]; then + path+=("$HOME/.rbenv/bin") + [[ ":$PATH:" != *":$HOME/.rbenv/shims:"* ]] && eval "$(rbenv init - zsh)" + fi + fi } # nvm (node) -src_nvm(){ - if [ -d "$HOME/.nvm" ]; then - export NVM_DIR="$HOME/.nvm" - [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" - [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" - fi +src_nvm() { + if [ -d "$HOME/.nvm" ]; then + export NVM_DIR="$HOME/.nvm" + [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" + [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" + fi } # pyenv (python3) src_pyenv() { - if [ -d "$HOME/.pyenv" ]; then - export PYENV_ROOT="$HOME/.pyenv" - path+=("$PYENV_ROOT/bin") - command -v pyenv > /dev/null && eval "$(pyenv init -)" - fi + if [ -d "$HOME/.pyenv" ]; then + export PYENV_ROOT="$HOME/.pyenv" + path+=("$PYENV_ROOT/bin") + command -v pyenv >/dev/null && eval "$(pyenv init -)" + fi } # go src_go() { - # move go path from ~/go to ~/.go (hidden) - [ -d "$HOME/go" ] && mv "$HOME/go" "$HOME/.go" - export GOPATH="$HOME/.go" - export GOWD="$GOPATH/src/github.com/lemonase" - export GOMOD="$GOPATH/pkg/mod/github.com/lemonase/" - path+=("$(go env GOPATH)/bin") + # move go path from ~/go to ~/.go (hidden) + [ -d "$HOME/go" ] && mv "$HOME/go" "$HOME/.go" + export GOPATH="$HOME/.go" + export GOWD="$GOPATH/src/github.com/lemonase" + export GOMOD="$GOPATH/pkg/mod/github.com/lemonase/" + path+=("$(go env GOPATH)/bin") } # rust/cargo src_rust() { - path+=("$HOME/.cargo/bin") + path+=("$HOME/.cargo/bin") } # ruby -if command -v rbenv > /dev/null; then - src_rbenv +if command -v rbenv >/dev/null; then + src_rbenv fi # go -if command -v go > /dev/null; then - src_go +if command -v go >/dev/null; then + src_go fi # rust -if command -v cargo > /dev/null; then - src_rust +if command -v cargo >/dev/null; then + src_rust fi - # * * * * * * * * * * * * # MISC $PATH Additions * # * * * * * * * * * * * * @@ -328,7 +322,7 @@ fi # ZSH syntax highlighting plugin ZSH_SYNTAX_HIGHLIGHT_PATH="${HOMEBREW_PREFIX}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" if [ ! -f "$ZSH_SYNTAX_HIGHLIGHT_PATH" ]; then - ZSH_SYNTAX_HIGHLIGHT_PATH="/usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" + ZSH_SYNTAX_HIGHLIGHT_PATH="/usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" fi [ -f "$ZSH_SYNTAX_HIGHLIGHT_PATH" ] && source $ZSH_SYNTAX_HIGHLIGHT_PATH