Move zsh folder, update to new zshrc template

To that end, we move zshlocal-calling into its own script.

zsh/omz-custom/less.zsh → zsh/custom/less.zsh

@@ -5,4 +5,4 @@
 # r = display raw control characters (Ctrl-A is ^A)
 # M = verbose `less` prompt
 # X = no init? Read `man` entry to find out more. Leaving it here.
-export LESS='-eirMX'
+export LESS='-irMX'

zsh/omz-custom/folder.zsh → zsh/custom/ls-and-cd.zsh

@@ -1,7 +1,7 @@
 # folder listing/traversal, least to most detailed
 alias l='ls'
 alias la='ls -A'
-alias ll='ls -lh'
+#alias ll='ls -lh'
 alias lal='ls -Alh'
 
 # common places

zsh/omz-custom/ssh-add.zsh → zsh/custom/ssh-add.zsh

@@ -13,7 +13,7 @@ fi
 SOCK="/tmp/ssh-agent-$USER-tmux"
 if test $SSH_AUTH_SOCK && [ $SSH_AUTH_SOCK != $SOCK ]
 then
-    rm -f /tmp/ssh-agent-$USER-screen
+    rm -f /tmp/ssh-agent-$USER-tmux
     ln -sf $SSH_AUTH_SOCK $SOCK
     export SSH_AUTH_SOCK=$SOCK
 fi

zsh/custom/zshlocal.zsh

@@ -0,0 +1,7 @@
+# Load machine-specific settings
+#
+# Some settings are specific to machines and should not be in a general dotfiles
+# repository. Read a local file that stores such settings.
+if [[ -r ~/.zshlocal ]]; then
+    source ~/.zshlocal
+fi

zsh/zshenv

@@ -9,8 +9,7 @@
 
 export EDITOR='vim'
 
-## paths
-export PATH=$HOME/bin:/usr/local/bin:$PATH # Take user executables before the system's.
+# Paths
 export PATH=$HOME/dotfiles/powerline/powerline/scripts:$PATH
 export PATH=$HOME/.rvm/bin:$PATH
 

zsh/zshrc

@@ -1,6 +1,5 @@
-# Path to your oh-my-zsh configuration.
-ZSH=$HOME/dotfiles/zsh/oh-my-zsh
-ZSH_CUSTOM=$HOME/dotfiles/zsh/omz-custom
+# Path to your oh-my-zsh installation.
+export ZSH=$HOME/dotfiles/zsh/oh-my-zsh
 
 # Set name of the theme to load.
 # Look in ~/.oh-my-zsh/themes/
@@ -8,36 +7,75 @@ ZSH_CUSTOM=$HOME/dotfiles/zsh/omz-custom
 # time that oh-my-zsh is loaded.
 ZSH_THEME="cinaeco"
 
-# Example aliases
-# alias zshconfig="mate ~/.zshrc"
-# alias ohmyzsh="mate ~/.oh-my-zsh"
-
-# Set to this to use case-sensitive completion
+# Uncomment the following line to use case-sensitive completion.
 # CASE_SENSITIVE="true"
 
-# Comment this out to disable weekly auto-update checks
+# Uncomment the following line to disable bi-weekly auto-update checks.
 DISABLE_AUTO_UPDATE="true"
 
-# Uncomment following line if you want to disable colors in ls
+# Uncomment the following line to change how often to auto-update (in days).
+# export UPDATE_ZSH_DAYS=13
+
+# Uncomment the following line to disable colors in ls.
 # DISABLE_LS_COLORS="true"
 
-# Uncomment following line if you want to disable autosetting terminal title.
+# Uncomment the following line to disable auto-setting terminal title.
 DISABLE_AUTO_TITLE="true"
 
-# Uncomment following line if you want red dots to be displayed while waiting for completion
+# Uncomment the following line to enable command auto-correction.
+# ENABLE_CORRECTION="true"
+
+# Uncomment the following line to display red dots whilst waiting for completion.
 COMPLETION_WAITING_DOTS="true"
 
+# Uncomment the following line if you want to disable marking untracked files
+# under VCS as dirty. This makes repository status check for large repositories
+# much, much faster.
+# DISABLE_UNTRACKED_FILES_DIRTY="true"
+
+# Uncomment the following line if you want to change the command execution time
+# stamp shown in the history command output.
+# The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
+# HIST_STAMPS="mm/dd/yyyy"
+
+# Would you like to use another custom folder than $ZSH/custom?
+# ZSH_CUSTOM=/path/to/new-custom-folder
+ZSH_CUSTOM=$HOME/dotfiles/zsh/custom
+
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
+# Add wisely, as too many plugins slow down shell startup.
 plugins=(git vi-mode colored-man z)
 
 source $ZSH/oh-my-zsh.sh
 
-# Customize to your needs...
-#  Most customisations are now under ZSH_CUSTOM
+# User configuration
 
-# Load settings specific to this machine
-if [[ -r ~/.zshlocal ]]; then
-    source ~/.zshlocal
-fi
+export PATH=$HOME/bin:/usr/local/bin:$PATH
+# export MANPATH="/usr/local/man:$MANPATH"
+
+# You may need to manually set your language environment
+# export LANG=en_US.UTF-8
+
+# Preferred editor for local and remote sessions
+# if [[ -n $SSH_CONNECTION ]]; then
+#   export EDITOR='vim'
+# else
+#   export EDITOR='mvim'
+# fi
+
+# Compilation flags
+# export ARCHFLAGS="-arch x86_64"
+
+# ssh
+# export SSH_KEY_PATH="~/.ssh/dsa_id"
+
+# Set personal aliases, overriding those provided by oh-my-zsh libs,
+# plugins, and themes. Aliases can be placed here, though oh-my-zsh
+# users are encouraged to define aliases within the ZSH_CUSTOM folder.
+# For a full list of active aliases, run `alias`.
+#
+# Example aliases
+# alias zshconfig="mate ~/.zshrc"
+# alias ohmyzsh="mate ~/.oh-my-zsh"