Split out zshrc into several files for cleanliness

8 files changed, 166 insertions, 117 deletions

diff --git a/setup.sh b/setup.sh
index 8f96add..e5bc970 100755
--- a/setup.sh
+++ b/setup.sh
@@ -63,11 +63,11 @@ fi
 
 ####################################################################################
 ###################### Making some directories for later use #######################
-mkdir -p $HOME/.config
-mkdir -p $HOME/.config/zsh
-mkdir -p $HOME/.config/newsboat
-mkdir -p $HOME/.config/mpd
-mkdir -p $HOME/.config/ncmpcpp
+mkdir -p $XDG_CONFIG_HOME
+mkdir -p $XDG_CONFIG_HOME/zsh
+mkdir -p $XDG_CONFIG_HOME/newsboat
+mkdir -p $XDG_CONFIG_HOME/mpd
+mkdir -p $XDG_CONFIG_HOME/ncmpcpp
 mkdir -p $HOME/.local/share/dwm
 
 #####################################################################################
@@ -103,15 +103,19 @@ git clone git.sateoki.xyz/self/dmenu    ./inst
 sh ./scripts/udcmdlink                                                           #####
 
 ######################### Set up symlinks to dotfiles ################################
-ln -s $HOME/git/syscfg/dotfiles/zsh/.zshrc     $HOME/.config/zsh/.zshrc
-ln -s $HOME/git/syscfg/dotfiles/zsh/.zshrc-mk  $HOME/.config/zsh/.zshrc-mk
-ln -s $HOME/git/syscfg/dotfiles/zsh/.zshenv    $HOME/.zshenv
-ln -s $HOME/git/syscfg/dotfiles/.xinitrc       $HOME/.xinitrc
+ln -s $HOME/git/syscfg/dotfiles/zsh/.zshrc         $XDG_CONFIG_HOME/zsh/.zshrc
+ln -s $HOME/git/syscfg/dotfiles/zsh/.zshrc-mk      $XDG_CONFIG_HOME/zsh/.zshrc-mk
+ln -s $HOME/git/syscfg/dotfiles/zsh/.zshrc-fn      $XDG_CONFIG_HOME/zsh/.zshrc-fn
+ln -s $HOME/git/syscfg/dotfiles/zsh/.zshrc-git     $XDG_CONFIG_HOME/zsh/.zshrc-git
+ln -s $HOME/git/syscfg/dotfiles/zsh/.zshrc-abbrev  $XDG_CONFIG_HOME/zsh/.zshrc-abbrev
+ln -s $HOME/git/syscfg/dotfiles/zsh/.zshrc-xdg     $XDG_CONFIG_HOME/zsh/.zshrc-xdg
+ln -s $HOME/git/syscfg/dotfiles/zsh/.zshenv        $HOME/.zshenv
+ln -s $HOME/git/syscfg/dotfiles/.xinitrc           $HOME/.xinitrc
 
 # Music
-ln -s $HOME/git/syscfg/dotfiles/mpd.conf       $HOME/.config/mpd.conf
+ln -s $HOME/git/syscfg/dotfiles/mpd.conf       $XDG_CONFIG_HOME/mpd.conf
 ln -s $HOME/git/syscfg/dotfiles/mpd.conf       /etc/mpd.conf
-ln -s $HOME/git/syscfg/dotfiles/ncmpcpp-config $HOME/.config/ncmpcpp/config
+ln -s $HOME/git/syscfg/dotfiles/ncmpcpp-config $XDG_CONFIG_HOME/ncmpcpp/config
 
 # sddm - only install if MINIMAL="no" 
 
diff --git a/zsh/.zshenv b/zsh/.zshenv
index 9102dc1..ca04cb1 100644
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -41,7 +41,11 @@ export ZSH_CACHE_DIR="$XDG_CACHE_HOME/zsh"
 # Qt Themes
 export QT_STYLE_OVERRIDE=kvantum
 
+# Source envvar's that don't belong in Git 
+source "$HOME/.config/zsh/.zshenv-src"
+
 # Vim
 # Below does not work, TODO fix so vim finds in $XDG_CONFIG_HOME/vim
 # export VIMINIT="if has("nvim") | so ${XDG_CONFIG_HOME:-$HOME/.config}/nvim/init.vim | else | set nocp | so ${XDG_CONFIG_HOME:-$HOME/.config}/vim/vimrc | endif"
+# export VIMINIT='let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc" | source $MYVIMRC'
 
diff --git a/zsh/.zshrc b/zsh/.zshrc
index d004993..4c3ab20 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -18,7 +18,7 @@ setopt HIST_SAVE_NO_DUPS
 
 # Various
 export LANG=en_GB.UTF-8
-setopt autocd
+unsetopt autocd
 unsetopt beep
 bindkey -v
 zstyle :compinstall filename "$HOME/.zshrc"
@@ -27,13 +27,8 @@ zstyle :compinstall filename "$HOME/.zshrc"
 autoload -U colors && colors
 autoload -U promptinit && promptinit
 
-########## Reducing clutter in home directory ##########
-alias feh="feh --no-fehbg"
-alias newsboat="prime-run newsboat -u ~/.config/newsboat/urls"
-alias mpv="prime-run mpv"
-alias gpg2="gpg2 --homedir $XDG_DATA_HOME/gnupg"
-alias wget='wget --hsts-file="$XDG_CACHE_HOME/wget-hsts"'
-alias svn="svn --config-dir \"$XDG_CONFIG_HOME\"/subversion"
+# Source .zshrc-xdg, which holds aliases to declutter the home directory 
+source "$XDG_CONFIG_HOME/zsh/.zshrc-xdg"
 
 ################################## orgd #######################################
 export ORGD_TD_PATH="$HOME/docs/wr/td"
@@ -46,56 +41,18 @@ fi
 source ~/.config/zsh/zsh-autopair/autopair.zsh
 autopair-init
 
-########## Aliases / Functions ##########
-# Allows declaring abbreviations:
-# declare a list of expandable aliases to fill up later
-typeset -a ealiases
-ealiases=()
-
-# write a function for adding an alias to the list mentioned above
-function abbrev-alias() {
-    alias $1
-    ealiases+=(${1%%\=*})
-}
-
-# expand any aliases in the current line buffer
-function expand-ealias() {
-    if [[ $LBUFFER =~ "\<(${(j:|:)ealiases})\$" ]]; then
-        zle _expand_alias
-        zle expand-word
-    fi
-    zle magic-space
-}
-zle -N expand-ealias
-
-# Bind the space key to the expand-alias function above, so that space will expand any expandable aliases
-bindkey ' '        expand-ealias
-bindkey '^ '       magic-space     # control-space to bypass completion
-bindkey -M isearch " "      magic-space     # normal space during searches
-
-# A function for expanding any aliases before accepting the line as is and executing the entered command
-expand-alias-and-accept-line() {
-    expand-ealias
-    zle .backward-delete-char
-    zle .accept-line
-}
-zle -N accept-line expand-alias-and-accept-line
-#
+# Source the abbrev file, which holds abbrev-alias and related settings. 
+source "$XDG_CONFIG_HOME/zsh/.zshrc-abbrev"
+
 # allow sudo to make use of aliases
 alias sudo="sudo "
 
-# various temporary
-pvd() {
-    mpv *$1*
-}
-
 # ls / exa 
-alias ls='ls -a --color=always'
-alias exa="exa -a --header --long --git --time-style=long-iso --group"
-abbrev-alias e="exa"
-abbrev-alias xc="clear; exa"
+alias ls='exa -a --color=always'
+alias ll="exa -a --header --long --git --time-style=long-iso --group"
+abbrev-alias x="clear; ls"
 abbrev-alias c="clear"
-abbrev-alias t="exa --tree"
+abbrev-alias t="ls --tree"
 
 # vim / nvim
 abbrev-alias v="vim"
@@ -112,7 +69,7 @@ abbrev-alias mnx="mpc next"
 abbrev-alias mpr="mpc prev"
 
 # backgrounds, wal...
-alias rbg="feh --no-fehbg --bg-fill $(shuf -n1 -e ~/bgs/*)"
+alias rbg='feh --no-fehbg --bg-fill $(shuf -n1 -e ~/bgs/*)'
 
 # cargo 
 abbrev-alias cb="cargo build"
@@ -135,63 +92,17 @@ abbrev-alias p="zathura"
 abbrev-alias o="libreoffice --writer" 
 abbrev-alias b="bat"
 
-# file manipulation
-defix() {
-    for i in  "$1"*;do mv "$i" "${i#"$1"}";done
-}
+# Source .zshrc-git, which contains all Git commands and aliases
 
-# pulseaudio - this is a temporary solution
-sv() {
-    pactl set-sink-volume 0 $1%
-}
-
-# git
 # TODO: add command to push to all remote repos, e.g. github, origin and gitlab
-abbrev-alias gb="git branch"
-abbrev-alias gco="git checkout" 
-abbrev-alias gcom="git checkout master"
-abbrev-alias gbd="git branch -d"
-abbrev-alias gp="git push"
-abbrev-alias gpa="git push origin && git push github && git push gitlab"
-abbrev-alias gpl="git pull" 
-abbrev-alias gs="git status"
-abbrev-alias ga="git add"
-abbrev-alias gc="git commit"
-abbrev-alias gcm="git commit -m"
-abbrev-alias gf="git fetch"
-abbrev-alias gcl="git clone"
-git-add-remotes() { # Add remotes
-    git remote add origin gitea@git.gabbott.dev:george/$1.git
-    git remote add github git@github.com:GeorgeAbbott/$1.git
-    git remote add gitlab git@gitlab.com:GeorgeAbbott/$1.git
-}
-git-rename-remotes() { # Rename all remotes 
-    git remote set-url origin gitea@git.gabbott.dev:george/$1.git
-    git remote set-url github git@github.com:GeorgeAbbott/$1.git
-    git remote set-url gitlab git@gitlab.com:GeorgeAbbott/$1.git
-}
-git-print-remotes() { # Print all remotes
-    git remote get-url origin 
-    git remote get-url github 
-    git remote get-url gitlab 
-}
-git-clone-add-remotes() { # Git clone from origin url and then add in the rest of remotes
-    git clone gitea@git.gabbott.dev:george/$1.git
-    cd ./$1
-    gar $1
-    cd ..
-}
-git-update-all() { # Update all - recursively iterates through dir and runs git pull 
-    # TODO implement
-}
-abbrev-alias gar="git-add-remotes"
-abbrev-alias grr="git-rename-remotes"
-abbrev-alias gpr="git-print-remotes"
-abbrev-alias gcr="git-clone-add-remotes"
+source "$XDG_CONFIG_HOME/zsh/.zshrc-git"
 
 # Source .zshrc-mk, which contains mkwr, mn, lle, and other mk~ commands
 source "$XDG_CONFIG_HOME/zsh/.zshrc-mk"
 
+# Source .zshrc-fn, which contains various miscellaneous functions 
+source "$XDG_CONFIG_HOME/zsh/.zshrc-fn"
+
 
 # misc
 alias pkg-query="pacman -Qq | fzf --preview 'pacman -Qil {}' --layout=reverse --bind 'enter:execute(pacman -Qil {} | less)'"
@@ -201,7 +112,7 @@ compinit
 # End of lines added by compinstall
 
 # z - must go after compinit
-eval "$(zoxide init zsh)"
+eval "$(zoxide init zsh --cmd cd)"
 
 
 # Sourcing for zsh
diff --git a/zsh/.zshrc-abbrev b/zsh/.zshrc-abbrev
new file mode 100644
index 0000000..d6214d5
--- /dev/null
+++ b/zsh/.zshrc-abbrev
@@ -0,0 +1,33 @@
+# Allows declaring abbreviations:
+# declare a list of expandable aliases to fill up later
+typeset -a ealiases
+ealiases=()
+
+# write a function for adding an alias to the list mentioned above
+function abbrev-alias() {
+    alias $1
+    ealiases+=(${1%%\=*})
+}
+
+# expand any aliases in the current line buffer
+function expand-ealias() {
+    if [[ $LBUFFER =~ "\<(${(j:|:)ealiases})\$" ]]; then
+        zle _expand_alias
+        zle expand-word
+    fi
+    zle magic-space
+}
+zle -N expand-ealias
+
+# Bind the space key to the expand-alias function above, so that space will expand any expandable aliases
+bindkey ' '        expand-ealias
+bindkey '^ '       magic-space # control-space to bypass completion
+bindkey -M isearch " "      magic-space     # normal space during searches
+
+# A function for expanding any aliases before accepting the line as is and executing the entered command
+expand-alias-and-accept-line() {
+    expand-ealias
+    zle .backward-delete-char
+    zle .accept-line
+}
+zle -N accept-line expand-alias-and-accept-line
diff --git a/zsh/.zshrc-fn b/zsh/.zshrc-fn
new file mode 100644
index 0000000..f58df75
--- /dev/null
+++ b/zsh/.zshrc-fn
@@ -0,0 +1,19 @@
+defix() {
+	for i in "$1"*;do mv "$i" "${i#"$1"}";done
+}
+
+rd() { # Rename current directory.
+	curr="$(dirname "$(pwd)")"
+	cd ..
+	mv "$curr" "$1"
+	cd "$curr" || return
+}
+
+# pulseaudio - this is a temporary solution
+sv() {
+    pactl set-sink-volume 0 $1%
+}
+
+pvd() {
+    mpv *$1*
+}
diff --git a/zsh/.zshrc-git b/zsh/.zshrc-git
new file mode 100644
index 0000000..2b7e2f6
--- /dev/null
+++ b/zsh/.zshrc-git
@@ -0,0 +1,44 @@
+git-add-remotes() { # Add remotes
+    git remote add origin gitea@git.gabbott.dev:george/$1.git
+    git remote add github git@github.com:GeorgeAbbott/$1.git
+    git remote add gitlab git@gitlab.com:GeorgeAbbott/$1.git
+}
+git-rename-remotes() { # Rename all remotes 
+    git remote set-url origin gitea@git.gabbott.dev:george/$1.git
+    git remote set-url github git@github.com:GeorgeAbbott/$1.git
+    git remote set-url gitlab git@gitlab.com:GeorgeAbbott/$1.git
+}
+git-print-remotes() { # Print all remotes
+    git remote get-url origin 
+    git remote get-url github 
+    git remote get-url gitlab 
+}
+git-clone-add-remotes() { # Git clone from origin url and then add in the rest of remotes
+    git clone gitea@git.gabbott.dev:george/$1.git
+    cd ./$1
+    gar $1
+    cd ..
+}
+git-update-all() { # Update all - recursively iterates through dir and runs git pull 
+    # TODO implement
+}
+
+# Git aliases
+abbrev-alias gb="git branch"
+abbrev-alias gco="git checkout" 
+abbrev-alias gcom="git checkout master"
+abbrev-alias gbd="git branch -d"
+abbrev-alias gp="git push"
+abbrev-alias gpa="git push origin && git push github && git push gitlab"
+abbrev-alias gpl="git pull" 
+abbrev-alias gs="git status"
+abbrev-alias ga="git add"
+abbrev-alias gc="git commit"
+abbrev-alias gcm="git commit -m"
+abbrev-alias gf="git fetch"
+abbrev-alias gcl="git clone"
+abbrev-alias gar="git-add-remotes"
+abbrev-alias grr="git-rename-remotes"
+abbrev-alias gpr="git-print-remotes"
+abbrev-alias gcr="git-clone-add-remotes"
+abbrev-alias gua="git-update-all"
diff --git a/zsh/.zshrc-mk b/zsh/.zshrc-mk
index a93d7a0..ce1e387 100644
--- a/zsh/.zshrc-mk
+++ b/zsh/.zshrc-mk
@@ -2,6 +2,33 @@ mkwr() {
 	nvim "$HOME/docs/wr/$1"
 }
 
+mksec() { # Make an encrypted (secure entry).
+	[ -z "$DEFAULT_GPG" ] && echo "DEFAULT_GPG not set" && return 
+	mkdir -p "/tmp/mksec"
+	nvim "/tmp/mksec/$1"
+	gpg --encrypt --armor --symmetric -r "$DEFAULT_GPG"  --output "$HOME/docs/wr/sec/$1" "/tmp/mksec/$1"
+	rm "/tmp/mksec/$1"
+}
+
+rdsec() { # Read a secure entry, will NOT write it back after. 
+	[ ! -f "$HOME/docs/wr/sec/$1" ] && echo "File $1 does not exist" && return
+	mkdir -p "/tmp/mksec"
+	gpg -d --output "/tmp/mksec/$1.decrypted" "$HOME/docs/wr/sec/$1"
+	nvim "/tmp/mksec/$1.decrypted"
+	rm "/tmp/mksec/$1.decrypted"
+}
+
+mdsec() { # Modify a secure entry, writing it back after. 
+	[ -z "$DEFAULT_GPG" ] && echo "DEFAULT_GPG not set" && return
+	[ ! -f "$HOME/docs/wr/sec/$1" ] && echo "File $1 does not exist" && return
+	mkdir -p "/tmp/mksec"
+	gpg -d --output "/tmp/mksec/$1.decrypted" "$HOME/docs/wr/sec/$1"
+	nvim "/tmp/mksec/$1.decrypted"
+	gpg --encrypt --armor --symmetric -r "$DEFAULT_GPG" --output "$HOME/docs/wr/sec/$1" "/tmp/mksec/$1.decrypted"
+	rm "/tmp/mksec/$1.decrypted"
+
+}
+
 mkrec() {
 	mkwr "rec/$1"
 }
diff --git a/zsh/.zshrc-xdg b/zsh/.zshrc-xdg
new file mode 100644
index 0000000..731f3e2
--- /dev/null
+++ b/zsh/.zshrc-xdg
@@ -0,0 +1,7 @@
+alias feh="feh --no-fehbg"
+alias newsboat="prime-run newsboat -u ~/.config/newsboat/urls"
+alias mpv="prime-run mpv"
+alias gpg2="gpg2 --homedir $XDG_DATA_HOME/gnupg"
+alias wget='wget --hsts-file="$XDG_CACHE_HOME/wget-hsts"'
+alias svn="svn --config-dir \"$XDG_CONFIG_HOME\"/subversion"
+