cleanup: (zsh) moved variables.zsh to zshrc, and added old block, for unused variables

3 files changed, 55 insertions, 75 deletions

diff --git a/config/essentials/zsh/aliases.zsh b/config/essentials/zsh/aliases.zsh
index 076f8a0..7b1d8cb 100644
--- a/config/essentials/zsh/aliases.zsh
+++ b/config/essentials/zsh/aliases.zsh
@@ -54,7 +54,7 @@ alias -g xrandr-default='xrandr --auto --output VGA-1 --mode 1920x1080 --left-of
  
 alias mv='mv -i'
 alias df='df -h'
-alias -g dud='du -d 1 -h | sort -h'
+alias -g dud='du -d 1 -h 2>/dev/null | sort -h'
 alias -g d='du --max-depth=0 -h'
 alias df='df -h'
 alias shred='shred -uz'
@@ -87,6 +87,7 @@ alias -g wf='doas wipefs -a'
 # quick config
 alias -g ez='$EDITOR ~/.zshrc'
 alias -g eza='$EDITOR ~/.config/zsh/aliases.zsh'
+alias -g ezv='$EDITOR ~/.config/zsh/variables.zsh'
 alias -g eto='$EDITOR ~/sync/TODO'
 
 alias -g ff='`fzffile`'
@@ -102,7 +103,6 @@ alias -s tar='tar tf'
 
 # oh-my-zsh git aliases
 alias g='git'
-
 alias ga='git add'
 alias gaa='git add --all'
 alias gapa='git add --patch'
@@ -110,12 +110,14 @@ alias gau='git add --update'
 alias gav='git add --verbose'
 alias gap='git apply'
 alias gapt='git apply --3way'
-
 alias gb='git branch'
 alias gba='git branch --all'
 alias gbd='git branch --delete'
 alias gbda='git branch --no-color --merged | command grep -vE "^([+*]|\s*($(git_main_branch)|$(git_develop_branch))\s*$)" | command xargs git branch --delete 2>/dev/null'
 alias gbD='git branch --delete --force'
+alias gbg='git branch -vv | grep ": gone\]"'
+alias gbgd='local res=$(gbg | awk '"'"'{print $1}'"'"') && [[ $res ]] && echo $res | xargs git branch -d'
+alias gbgD='local res=$(gbg | awk '"'"'{print $1}'"'"') && [[ $res ]] && echo $res | xargs git branch -D'
 alias gbl='git blame -b -w'
 alias gbnm='git branch --no-merged'
 alias gbr='git branch --remote'
@@ -124,7 +126,6 @@ alias gbsb='git bisect bad'
 alias gbsg='git bisect good'
 alias gbsr='git bisect reset'
 alias gbss='git bisect start'
-
 alias gc='git commit --verbose'
 alias gc!='git commit --verbose --amend'
 alias gcn!='git commit --verbose --no-edit --amend'
@@ -138,10 +139,11 @@ alias gcas='git commit --all --signoff'
 alias gcasm='git commit --all --signoff --message'
 alias gcb='git checkout -b'
 alias gcf='git config --list'
-
-alias gcl='git clone --recurse-submodules'
+alias gcl='git clone'
+alias gclr='git clone --recurse-submodules'
+alias gc1='git clone --depth 1'
 alias gclean='git clean --interactive -d'
-alias gpristine='git reset --hard && git clean --force -dx'
+alias gpristine='git reset --hard && git clean --force -dfx'
 alias gcm='git checkout $(git_main_branch)'
 alias gcd='git checkout $(git_develop_branch)'
 alias gcmsg='git commit --message'
@@ -154,7 +156,6 @@ alias gcpc='git cherry-pick --continue'
 alias gcs='git commit --gpg-sign'
 alias gcss='git commit --gpg-sign --signoff'
 alias gcssm='git commit --gpg-sign --signoff --message'
-
 alias gd='git diff'
 alias gdca='git diff --cached'
 alias gdcw='git diff --cached --word-diff'
@@ -163,25 +164,22 @@ alias gds='git diff --staged'
 alias gdt='git diff-tree --no-commit-id --name-only -r'
 alias gdup='git diff @{upstream}'
 alias gdw='git diff --word-diff'
-
 alias gf='git fetch'
-
+alias gfo='git fetch origin'
+alias gfg='git ls-files | grep'
+alias gg='git gui citool'
+alias gga='git gui citool --amend'
 alias ggpur='ggu'
 alias ggpull='git pull origin "$(git_current_branch)"'
 alias ggpush='git push origin "$(git_current_branch)"'
-
 alias ggsup='git branch --set-upstream-to=origin/$(git_current_branch)'
 alias gpsup='git push --set-upstream origin $(git_current_branch)'
-
 alias ghh='git help'
-
 alias gignore='git update-index --assume-unchanged'
 alias gignored='git ls-files -v | grep "^[[:lower:]]"'
 alias git-svn-dcommit-push='git svn dcommit && git push github $(git_main_branch):svntrunk'
-
 alias gk='\gitk --all --branches &!'
 alias gke='\gitk --all $(git log --walk-reflogs --pretty=%h) &!'
-
 alias gl='git pull'
 alias glg='git log --stat'
 alias glgp='git log --stat --patch'
@@ -197,23 +195,20 @@ alias glola="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgr
 alias glog='git log --oneline --decorate --graph'
 alias gloga='git log --oneline --decorate --graph --all'
 alias glp="_git_log_prettily"
-
 alias gm='git merge'
 alias gmom='git merge origin/$(git_main_branch)'
 alias gmtl='git mergetool --no-prompt'
 alias gmtlvim='git mergetool --no-prompt --tool=vimdiff'
 alias gmum='git merge upstream/$(git_main_branch)'
 alias gma='git merge --abort'
-
 alias gp='git push'
 alias gpd='git push --dry-run'
-alias gpf='git push --force-with-lease'
 alias gpf!='git push --force'
 alias gpoat='git push origin --all && git push origin --tags'
+alias gpod='git push origin --delete'
 alias gpr='git pull --rebase'
 alias gpu='git push upstream'
 alias gpv='git push --verbose'
-
 alias gr='git remote'
 alias gra='git remote add'
 alias grb='git rebase'
@@ -241,7 +236,6 @@ alias grt='cd "$(git rev-parse --show-toplevel || echo .)"'
 alias gru='git reset --'
 alias grup='git remote update'
 alias grv='git remote --verbose'
-
 alias gsb='git status --short --branch'
 alias gsd='git svn dcommit'
 alias gsh='git show'
@@ -250,8 +244,6 @@ alias gsps='git show --pretty=short --show-signature'
 alias gsr='git svn rebase'
 alias gss='git status --short'
 alias gst='git status'
-
-alias gsta='git stash push'
 alias gstaa='git stash apply'
 alias gstc='git stash clear'
 alias gstd='git stash drop'
@@ -265,11 +257,9 @@ alias gsw='git switch'
 alias gswc='git switch --create'
 alias gswm='git switch $(git_main_branch)'
 alias gswd='git switch $(git_develop_branch)'
-
 alias gts='git tag --sign'
 alias gtv='git tag | sort -V'
 alias gtl='gtl(){ git tag --sort=-v:refname -n --list "${1}*" }; noglob gtl'
-
 alias gunignore='git update-index --no-assume-unchanged'
 alias gunwip='git log --max-count=1 | grep -q -c "\--wip--" && git reset HEAD~1'
 alias gup='git pull --rebase'
@@ -280,16 +270,13 @@ alias gupom='git pull --rebase origin $(git_main_branch)'
 alias gupomi='git pull --rebase=interactive origin $(git_main_branch)'
 alias glum='git pull upstream $(git_main_branch)'
 alias gluc='git pull upstream $(git_current_branch)'
-
 alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'
 alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign --message "--wip-- [skip ci]"'
-
 alias gwt='git worktree'
 alias gwta='git worktree add'
 alias gwtls='git worktree list'
 alias gwtmv='git worktree move'
 alias gwtrm='git worktree remove'
-
 alias gam='git am'
 alias gamc='git am --continue'
 alias gams='git am --skip'
diff --git a/config/essentials/zsh/variables.zsh b/config/essentials/zsh/variables.zsh
deleted file mode 100644
index 77da52d..0000000
--- a/config/essentials/zsh/variables.zsh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/zsh
-# VARIABLES
-export ZOT="${HOME}/zot"
-
-export EDITOR="nvim"
-export VISUAL="nvim"
-export TERMINAL="alacritty"
-export BROWSER="firefox"
-
-# colored GCC warnings and errors
-export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
-
-# Prevent ranger from loading config twice
-export RANGER_LOAD_DEFAULT_RC=FALSE
-
-# Color of zsh-suggestion
-export ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=10'
-export STARSHIP_CONFIG="${HOME}/.config/starship/starship.toml"
-export FUNCNEST=10000
-export fpath=($HOME/.config/zsh/completion/ $fpath)
-
-# Config files from .config
-export XINITRC="$HOME/.config/x11/xinitrc"
-export GNUPGHOME="$HOME/.config/gnupg"
-export GTK2_RC_FILES="$HOME/.config/gtk-2.0/gtkrc-2.0"
-# export VIMINIT="source ~/.config/vim/vimrc"
-export NVM_DIR="$HOME/.config/nvm"
-
-export PASSWORD_STORE_CLIP_TIME=5
diff --git a/config/zshrc/.zshrc b/config/zshrc/.zshrc
index 574e631..47078d1 100644
--- a/config/zshrc/.zshrc
+++ b/config/zshrc/.zshrc
@@ -4,8 +4,6 @@ export PATH="$HOME/.local/bin:$PATH"
 export PATH="$HOME/bin:$PATH"
 export PATH="$HOME/go/bin:$PATH"
 
-test -f ~/.config/zsh/variables.zsh && source ~/.config/zsh/variables.zsh
-
 if [ ! $(pgrep Xorg) ] && [ "tty1" = "$(basename $(tty))" ]
 then
 	clear
@@ -16,18 +14,26 @@ then
 fi
 
 autoload -U select-word-style
-select-word-style bash
 autoload -z edit-command-line
 zle -N edit-command-line
 zstyle ':compinstall' filename '/home/aluc/.zshrc'
 zstyle ':completion:*' menu select
 autoload -Uz compinit
-compinit
-
 autoload -Uz surround
 zle -N delete-surround surround
 zle -N add-surround surround
 zle -N change-surround surround
+compinit
+
+for f in \
+	/usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh \
+	/usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh \
+	~/.config/zsh/functions.zsh \
+	~/.config/zsh/aliases.zsh
+do
+	test -f $f && source $f
+done
+
 bindkey -v
 bindkey -a cs change-surround
 bindkey -a ds delete-surround
@@ -35,8 +41,8 @@ bindkey -a ys add-surround
 bindkey -M visual S add-surround
 bindkey "^A"  beginning-of-line
 bindkey "^E"  end-of-line
-# necessary for completeinword
-bindkey '^I' expand-or-complete-prefix
+bindkey '^I' expand-or-complete-prefix # necessary for completeinword
+bindkey '^Y' autosuggest-accept
 bindkey "^K"  kill-line
 bindkey "^P"  up-line-or-history
 bindkey "^N"  down-line-or-history
@@ -60,6 +66,10 @@ rehash_precmd() {
 }
 add-zsh-hook -Uz precmd rehash_precmd
 
+# prompt
+PS1=' %B%(#.%F{1}.%F{13})[%n%b%f@%B%F{6}%m]%b%f %3~ '
+RPROMPT='%F{red}$(parse_git_status)%f%F{green}$(parse_git_branch)%f%(?.. %?)'
+
 setopt prompt_subst
 parse_git_branch() {
     git symbolic-ref --short HEAD 2> /dev/null || git rev-parse --short HEAD 2> /dev/null
@@ -67,12 +77,9 @@ parse_git_branch() {
 parse_git_status() {
 	git status --short 2> /dev/null | head -n1 | awk '{print $1 " "}'
 }
-PS1=' %B%(#.%F{1}.%F{13})[%n%b%f@%B%F{6}%m]%b%f %3~ '
-RPROMPT='%F{red}$(parse_git_status)%f%F{green}$(parse_git_branch)%f%(?.. %?)'
 
 # Options
 setopt correct 
-#I am scared of "no matches found"
 setopt nonomatch 
 setopt autocd
 setopt completeinword
@@ -83,15 +90,30 @@ setopt interactivecomments
 setopt notify
 setopt cdablevars
 
-for f in \
-	/usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh \
-	/usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh \
-	~/.config/zsh/functions.zsh \
-	~/.config/zsh/aliases.zsh
-do
-	test -f $f && source $f
-done
-
+# Variables
 HISTFILE=~/.config/zsh/histfile
 HISTSIZE=100000
 SAVEHIST=100000
+
+ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=10'
+
+export ZOT="${HOME}/zot"
+
+export EDITOR="nvim"
+export VISUAL="nvim"
+export TERMINAL="alacritty"
+export BROWSER="firefox"
+
+export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
+
+export XINITRC="$HOME/.config/x11/xinitrc"
+export GNUPGHOME="$HOME/.config/gnupg"
+export GTK2_RC_FILES="$HOME/.config/gtk-2.0/gtkrc-2.0"
+
+export PASSWORD_STORE_CLIP_TIME=5
+
+# old
+# export RANGER_LOAD_DEFAULT_RC=FALSE
+# export VIMINIT="source ~/.config/vim/vimrc"
+# export NVM_DIR="$HOME/.config/nvm"
+# export fpath=($HOME/.config/zsh/completion/ $fpath)