clean up zsh config more

zsh/omz-custom/auto-ssh-hosts.zsh

@@ -4,12 +4,13 @@
 # https://github.com/dangerous/dotfiles
 # Works in conjunction with .ssh/config for username@hostname
 #
+
+## hosts file
+alias hosts='sudo vim /etc/hosts'
+
 local _myhosts
 _myhosts=( ${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[0-9]*}%%\ *}%%,*} )
 
 for host in $_myhosts; do
   alias $host="ssh $host"
 done
-
-## hosts file
-alias hosts='sudo vim /etc/hosts'

zsh/omz-custom/dev.zsh → zsh/omz-custom/dev-acer.zsh

@@ -1,5 +1,5 @@
 #
-# shortcuts for development
+# shortcuts for development of ACER projects
 #
 
 # logs
@@ -13,12 +13,14 @@ alias cda='cd /jails/alcatraz/usr/local/www/auth'
 alias cdd='cd /jails/alcatraz/usr/local/www/delivery'
 alias cdo='cd /jails/alcatraz/usr/local/www/oars'
 alias cds='cd /jails/alcatraz/usr/local/www/schools'
-alias cd.='cd ~/dotfiles'
 
 # db
 alias migrate='li3 migration db:migrate'
 alias sqlo='mysql -u oars -p'
 
+# git log made to be a kind-of helpful kali summary in git repositories
+alias kali='git log --author=eiyi --date=short --pretty="format:%C(yellow)[%cd] %Cblue%s %Creset -- %cn %h"'
+
 ## shortcuts for Jails setup
 #alias guantanamo-start='env -i /usr/sbin/chroot /jails/guantanamo /usr/local/apache2/bin/httpd -k start'
 #alias guantanamo-graceful='env -i /usr/sbin/chroot /jails/guantanamo /usr/local/apache2/bin/httpd -k graceful'

zsh/omz-custom/file-folder-ops.zsh

@@ -1,17 +0,0 @@
-## folder listing/traversal
-alias l='ls'
-alias ll='ls -hl'
-alias la='ls -A'
-alias lal="ls -Ahl"
-alias cd..='cd ..';
-alias ..='cd ..'
-alias -g ...="../.."
-alias -g ....="../../.."
-alias -g .....="../../../.."
-
-## file/folder manipulation
-alias mkdir='nocorrect mkdir'
-alias mv='nocorrect mv'
-alias cp='nocorrect cp'
-alias touch='nocorrect touch'
-alias ln='nocorrect ln'

zsh/omz-custom/folder.zsh

@@ -0,0 +1,5 @@
+# folder listing/traversal
+alias la='ls -A'
+
+# common places
+alias cd.='cd ~/dotfiles'

zsh/omz-custom/git.zsh

@@ -8,8 +8,7 @@ alias gds='git diff --staged'
 alias gcob='git checkout -b'
 alias gf='git fetch'
 
-alias gbd='git branch -d'
-alias gbD='git branch -D'
+alias gbd='git branch -D'
 
 alias gl='git log --graph --date=relative --pretty="format:%C(yellow)%h %Cblue[%cn] %Creset%s... %cd"'
 alias gls='git log --graph --stat'