7b948c30feda68c98991eafc06b9cae5eb485f45

  1diff --git a/dot_aliases b/dot_aliases
  2new file mode 100644
  3index 0000000000000000000000000000000000000000..4afa42c831702418ee26fb141a09cabeb021d0ec
  4--- /dev/null
  5+++ b/dot_aliases
  6@@ -0,0 +1,77 @@
  7+# vim: ft=zsh
  8+
  9+# General
 10+alias '...'='../..'
 11+alias '....'='../../..'
 12+alias '.....'='../../../..'
 13+alias '......'='../../../../..'
 14+alias '.......'='../../../../../..'
 15+alias '........'='../../../../../../..'
 16+alias ls='ls --group-directories-first --color=always --time-style=long-iso'
 17+alias cl=clear
 18+alias cdl='cd ~/ && cl'
 19+alias rmr='rm -rIf'
 20+alias mkdir='mkdir -p'
 21+alias df='df -h'
 22+alias ran=ranger
 23+alias -g WC='| wc -l'
 24+alias rcp='rsync -rPv'
 25+alias cal='cal -m'
 26+alias grep='grep -Hn --color=always'
 27+alias -g NO='>/dev/null 2>&1'
 28+alias -g clip='xclip -selection c'
 29+alias db='sudo duplicity-backup -c /etc/duplicity/duplicity-backup.conf'
 30+alias wakerouter='wol 18:a9:05:39:c4:4d'
 31+alias myip='curl icanhazip.com'
 32+alias -g vim='nvim'
 33+alias manage='python manage.py'
 34+alias zpool='sudo zpool'
 35+alias 'zpool import'='zpool import -d /dev/disk/by-id'
 36+alias zfs='sudo zfs'
 37+alias fdisk='sudo fdisk'
 38+alias cfn='cfn-lint'
 39+alias diff='diff -y --suppress-common-lines'
 40+alias -g HASH='| sha256sum | base64 H -n1 | clip'
 41+alias cz=chezmoi
 42+alias dockre=docker
 43+alias unbound='cd ~/dev/docker/unbound; dcrestart; -'
 44+
 45+# Systemctl aliases
 46+alias sctl='sudo systemctl'
 47+alias sstatus='sudo systemctl status'
 48+alias sstart='sudo systemctl start'
 49+alias srestart='sudo systemctl restart'
 50+alias sreload='sudo systemctl reload'
 51+alias sstop='sudo systemctl stop'
 52+alias senable='sudo systemctl enable'
 53+alias sdisable='sudo systemctl disable'
 54+alias hib='sudo systemctl suspend'
 55+
 56+alias suctl='systemctl --user'
 57+alias sustatus='systemctl --user status'
 58+alias sustart='systemctl --user start'
 59+alias surestart='systemctl --user restart'
 60+alias sureload='systemctl --user reload'
 61+alias sustop='systemctl --user stop'
 62+alias suenable='systemctl --user enable'
 63+alias sudisable='systemctl --user disable'
 64+
 65+# Pass aliases
 66+alias psh='pass show'
 67+alias psi='pass insert'
 68+alias pse='pass edit'
 69+alias pgp='pass git push'
 70+alias pgl='pass git pull'
 71+
 72+# Oh my zsh alias override
 73+alias yar='yay'
 74+alias -g du='du -sh'
 75+alias -g duf='du -sh * | sort -h'
 76+alias -g dufa='du -sh * .* | sort -h'
 77+alias la='ls -a'
 78+alias ll='ls -lah'
 79+unalias -m 'fd'
 80+unalias -m 'ff'
 81+unalias -m '_'
 82+unalias -m 'please'
 83+unalias -m 'rm'
 84diff --git a/dot_zshrc b/dot_zshrc
 85index 1f7e49bea3a1de7c6170246d14878b5a151251fc..b967c83b23c9fbbecfd8840b2da43df47060db0c 100644
 86--- a/dot_zshrc
 87+++ b/dot_zshrc
 88@@ -45,80 +45,7 @@ fpath=(~/.config/zsh/completions ~/.config/zsh/functions $fpath)
 89 autoload -Uz compinit && compinit
 90 autoload -Uz ~/.config/zsh/functions/*
 91 
 92-# Aliases
 93-alias '...'='../..'
 94-alias '....'='../../..'
 95-alias '.....'='../../../..'
 96-alias '......'='../../../../..'
 97-alias '.......'='../../../../../..'
 98-alias '........'='../../../../../../..'
 99-alias ls='ls --group-directories-first --color=always --time-style=long-iso'
100-alias cl=clear
101-alias cdl='cd ~/ && cl'
102-alias rmr='rm -rIf'
103-alias mkdir='mkdir -p'
104-alias df='df -h'
105-alias ran=ranger
106-alias -g WC='| wc -l'
107-alias rcp='rsync -rPv'
108-alias cal='cal -m'
109-alias grep='grep -Hn --color=always'
110-alias -g NO='>/dev/null 2>&1'
111-alias -g clip='xclip -selection c'
112-alias db='sudo duplicity-backup -c /etc/duplicity/duplicity-backup.conf'
113-alias wakerouter='wol 18:a9:05:39:c4:4d'
114-alias myip='curl icanhazip.com'
115-alias -g vim='nvim'
116-alias manage='python manage.py'
117-alias zpool='sudo zpool'
118-alias 'zpool import'='zpool import -d /dev/disk/by-id'
119-alias zfs='sudo zfs'
120-alias fdisk='sudo fdisk'
121-alias cfn='cfn-lint'
122-alias diff='diff -y --suppress-common-lines'
123-alias -g HASH='| sha256sum | base64 H -n1 | clip'
124-alias cz=chezmoi
125-alias dockre=docker
126-alias unbound='cd ~/dev/docker/unbound; dcrestart; -'
127-
128-# Systemctl aliases
129-alias sctl='sudo systemctl'
130-alias sstatus='sudo systemctl status'
131-alias sstart='sudo systemctl start'
132-alias srestart='sudo systemctl restart'
133-alias sreload='sudo systemctl reload'
134-alias sstop='sudo systemctl stop'
135-alias senable='sudo systemctl enable'
136-alias sdisable='sudo systemctl disable'
137-alias hib='sudo systemctl suspend'
138-
139-alias suctl='systemctl --user'
140-alias sustatus='systemctl --user status'
141-alias sustart='systemctl --user start'
142-alias surestart='systemctl --user restart'
143-alias sureload='systemctl --user reload'
144-alias sustop='systemctl --user stop'
145-alias suenable='systemctl --user enable'
146-alias sudisable='systemctl --user disable'
147-
148-# Pass aliases
149-alias psh='pass show'
150-alias psi='pass insert'
151-alias pgp='pass git push'
152-alias pgl='pass git pull'
153-
154-# Oh my zsh alias override
155-alias yar='yay'
156-alias -g du='du -sh'
157-alias -g duf='du -sh * | sort -h'
158-alias -g dufa='du -sh * .* | sort -h'
159-alias la='ls -a'
160-alias ll='ls -lah'
161-unalias -m 'fd'
162-unalias -m 'ff'
163-unalias -m '_'
164-unalias -m 'please'
165-unalias -m 'rm'
166+source ~/.aliases
167 
168 # Variable exports
169 export VISUAL="nvim"