cleaned up a bit, work in progress..

core/aliases.zsh

@@ -1,26 +1,21 @@
-# Push and pop directories on directory stack
-alias pu='pushd'
-alias po='popd'
-
-# Basic directory operations
+# directory operations
+alias ..='cd ..'
 alias ...='cd ../..'
+alias ....='cd ../../..'
+alias .....='cd ../../../..'
 alias -- -='cd -'
 
-# Super user
-alias _='sudo'
+alias md='mkdir -p'
+alias rd='rm -r'
+
+# directory listings
+alias ll='ls -l'
+alias la='ls -la'
+alias lh='ls -lh'
+alias sl='ls'
+
+# super user
 alias please='sudo'
 
-#alias g='grep -in'
-
-# Show history
-alias history='fc -l 1'
-
-# List direcory contents
-alias lsa='ls -lah'
-alias l='ls -lA1'
-alias ll='ls -l'
-alias la='ls -lA'
-alias sl=ls # often screw this up
-
-alias afind='ack-grep -il'
-
+# show history
+alias history='fc -ln 1'

core/directories.zsh

@@ -1,39 +0,0 @@
-# Changing/making/removing directory
-setopt auto_name_dirs
-setopt auto_pushd
-setopt pushd_ignore_dups
-
-alias ..='cd ..'
-alias cd..='cd ..'
-alias cd...='cd ../..'
-alias cd....='cd ../../..'
-alias cd.....='cd ../../../..'
-alias cd/='cd /'
-
-alias 1='cd -'
-alias 2='cd +2'
-alias 3='cd +3'
-alias 4='cd +4'
-alias 5='cd +5'
-alias 6='cd +6'
-alias 7='cd +7'
-alias 8='cd +8'
-alias 9='cd +9'
-
-cd () {
-  if   [[ "x$*" == "x..." ]]; then
-    cd ../..
-  elif [[ "x$*" == "x...." ]]; then
-    cd ../../..
-  elif [[ "x$*" == "x....." ]]; then
-    cd ../../../..
-  elif [[ "x$*" == "x......" ]]; then
-    cd ../../../../..
-  else
-    builtin cd "$@"
-  fi
-}
-
-alias md='mkdir -p'
-alias rd=rmdir
-alias d='dirs -v | head -10'

core/edit-command-line.zsh

@@ -1,3 +0,0 @@
-autoload -U edit-command-line
-zle -N edit-command-line
-bindkey '\C-x\C-e' edit-command-line

core/functions.zsh

@@ -1,17 +0,0 @@
-function zsh_stats() {
-  history | awk '{CMD[$2]++;count++;}END { for (a in CMD)print CMD[a] " " CMD[a]/count*100 "% " a;}' | grep -v "./" | column -c3 -s " " -t | sort -nr | nl |  head -n20
-}
-
-function uninstall_oh_my_zsh() {
-  /usr/bin/env ZSH=$ZSH /bin/sh $ZSH/tools/uninstall.sh
-}
-
-function upgrade_oh_my_zsh() {
-  /usr/bin/env ZSH=$ZSH /bin/sh $ZSH/tools/upgrade.sh
-}
-
-function take() {
-  mkdir -p $1
-  cd $1
-}
-

plugins/david.zsh

@@ -3,8 +3,6 @@ alias zz='source ~/.zshrc'
 alias vz='vim ~/.zshrc && source ~/.zshrc'
 alias vp='vim $ZSH/plugins/david.zsh && source ~/.zshrc'
 alias vt='vim $ZSH/themes/david.zsh && source ~/.zshrc'
-alias ll="ls -l"
-alias la="ls -la"
 alias vi="vim"
 alias vless="/usr/share/vim/vim73/macros/less.sh"
 alias publish="python2 -m SimpleHTTPServer"