Merged custom/ and lib/.

Conflicts:

	custom/aliases.zsh
	custom/functions.zsh
	custom/grep.zsh

custom/aliases.zsh

@@ -1,75 +0,0 @@
-# The 'ls' family
-# ------------------------------------------------------------------------------
-[[ "$DISABLE_COLOR" != 'true' ]] && {
-  [[ -x "${commands[gdircolors]}" ]] && use_color_gnu='true' || use_color_bsd='true'
-}
-
-[[ "$use_color_gnu" == 'true' && -e "$HOME/.dir_colors" ]] && eval $(gdircolors $HOME/.dir_colors)
-[[ "$use_color_bsd" == 'true' ]] && export CLICOLOR=1
-[[ "$use_color_bsd" == 'true' ]] && export LSCOLORS="exfxcxdxbxegedabagacad"
-
-# add colors for filetype recognition
-[[ "$use_color_gnu" == 'true' ]] && alias ls='ls -hF --group-directories-first --color=auto'
-[[ "$use_color_bsd" == 'true' ]] && alias ls='ls -G -F'
-
-alias la='ls -Ahl'           # show hidden files
-alias lx='ls -lhXB'          # sort by extension
-alias lk='ls -lhSr'          # sort by size, biggest last
-alias lc='ls -lhtcr'         # sort by and show change time, most recent last
-alias lu='ls -lhtur'         # sort by and show access time, most recent last
-alias lt='ls -lhtr'          # sort by date, most recent last
-alias lm='ls -ahl | more'    # pipe through 'more'
-alias lr='ls -lhR'           # recursive ls
-alias l='ls -lha'
-alias ll='ls -lh'
-
-# General
-# ------------------------------------------------------------------------------
-alias rm='nocorrect rm -i'
-alias cp='nocorrect cp -i'
-alias mv='nocorrect mv -i'
-alias ln='nocorrect ln -i'
-alias mkdir='nocorrect mkdir -p'
-alias du='du -kh'
-alias df='df -kh'
-alias e="$EDITOR"
-alias get='curl -C - -O'
-alias q='exit'
-alias ssh='ssh -X'
-alias h='history'
-alias j='jobs -l'
-alias f='fg'
-alias gr='grep -r'
-alias type='type -a'
-alias print-path='echo -e ${PATH//:/\\n}'
-alias print-libpath='echo -e ${LD_LIBRARY_PATH//:/\\n}'
-alias lsbom='lsbom -f -l -s -pf'
-alias t="$HOME/.local/bin/t --task-dir ~/.tasks --list todo.txt --delete-if-empty"
-
-if [[ -x "${commands[htop]}" ]]; then
-  alias top=htop
-else
-  alias topm='top -o vsize'
-  alias topc='top -o cpu'
-fi
-
-[[ "$DISABLE_COLOR" != 'true' ]] && {
-  [[ -x "${commands[colordiff]}" ]] && alias diff='colordiff'
-  [[ -x "${commands[colormake]}" ]] && alias make='colormake'
-}
-
-# Screen
-# ------------------------------------------------------------------------------
-[[ "$TERM" == 'xterm-color'  && -e "$HOME/.screenrc" ]] && screenrc="-c '$HOME/.screenrc'"
-[[ "$TERM" == 'xterm-256color' && -e "$HOME/.screenrc256" ]] && screenrc="-c '$HOME/.screenrc256'"
-alias screen="screen $screenrc"
-alias sl="screen $screenrc -list"
-alias sr="screen $screenrc -a -A -U -D -R"
-alias S="screen $screenrc -U -S"
-
-# TMUX
-# ------------------------------------------------------------------------------
-[[ "$TERM" == 'xterm-color' && -e "$HOME/.tmux.conf" ]] && tmuxconf="-f '$HOME/.tmux.conf'"
-[[ "$TERM" == 'xterm-256color' && -e "$HOME/.tmux256.conf" ]] && tmuxconf="-f '$HOME/.tmux256.conf'"
-alias tmux="tmux $tmuxconf"
-alias tls="tmux list-sessions"

custom/directories.zsh

@@ -1 +0,0 @@
-unsetopt auto_pushd

custom/functions.zsh

@@ -1,46 +0,0 @@
-function cdll() {
-  if [[ -n "$1" ]]; then
-    builtin cd "$1"
-    ls -lFhA
-  else
-    ls -lFhA
-  fi
-}
-
-function pushdll() {
-  if [[ -n "$1" ]]; then
-    builtin pushd "$1"
-    ls -lFhA
-  else
-    ls -lFhA
-  fi
-}
-
-function popdll() {
-  builtin popd
-  ls -lFhA
-}
-
-function grab() {
-  sudo chown -R ${USER} ${1:-.}
-}
-
-function reload() {
-  source "$HOME/.zshrc"
-}
-
-function calc() {
-  echo "scale=4; $@" | bc -l
-}
-
-function pmine() {
-  ps $@ -u $USER -o pid,%cpu,%mem,command
-}
-
-function findexec() {
-  find . -type f -iname '*'${1:-}'*' -exec ${2:-file} {} \;
-}
-
-function httpserve() {
-  python -m SimpleHTTPServer
-}

custom/grep.zsh

@@ -1,7 +0,0 @@
-if [[ "$DISABLE_COLOR" != "true" ]]; then
-    export GREP_OPTIONS='--color=auto'
-    export GREP_COLOR='37;45'
-else
-    export GREP_OPTIONS='--color=none'
-    export GREP_COLOR=''
-fi

custom/shortcuts.zsh

@@ -1,5 +0,0 @@
-# Add yourself some shortcuts to projects you often work on
-# Example:
-#
-# brainstormr=/Users/robbyrussell/Projects/development/planetargon/brainstormr
-#

lib/aliases.zsh

@@ -1,24 +1,83 @@
-# Push and pop directories on directory stack
+# The 'ls' family
-alias pu='pushd'
+# ------------------------------------------------------------------------------
-alias po='popd'
+[[ "$DISABLE_COLOR" != 'true' ]] && {
+  [[ -x "${commands[gdircolors]}" ]] && use_color_gnu='true' || use_color_bsd='true'
+}
 
-# Basic directory operations
+[[ "$use_color_gnu" == 'true' && -e "$HOME/.dir_colors" ]] && eval $(gdircolors $HOME/.dir_colors)
+[[ "$use_color_bsd" == 'true' ]] && export CLICOLOR=1
+[[ "$use_color_bsd" == 'true' ]] && export LSCOLORS="exfxcxdxbxegedabagacad"
+
+# add colors for filetype recognition
+[[ "$use_color_gnu" == 'true' ]] && alias ls='ls -hF --group-directories-first --color=auto'
+[[ "$use_color_bsd" == 'true' ]] && alias ls='ls -G -F'
+
+alias ll='ls -lh'            # show human readable 
+alias la='ls -lhA'           # show hidden files
+alias lx='ls -lhXB'          # sort by extension
+alias lk='ls -lhSr'          # sort by size, biggest last
+alias lc='ls -lhtcr'         # sort by and show change time, most recent last
+alias lu='ls -lhtur'         # sort by and show access time, most recent last
+alias lt='ls -lhtr'          # sort by date, most recent last
+alias lm='ls -lha | more'    # pipe through 'more'
+alias lr='ls -lhR'           # recursive ls
+alias sl='ls'                # often screw this up
+
+# General
+# ------------------------------------------------------------------------------
 alias ...='cd ../..'
 alias -- -='cd -'
-
+alias rm='nocorrect rm -i'
-# Super user
+alias cp='nocorrect cp -i'
+alias mv='nocorrect mv -i'
+alias ln='nocorrect ln -i'
+alias mkdir='nocorrect mkdir -p'
+alias du='du -kh'
+alias df='df -kh'
+alias pu='pushd'
+alias po='popd'
 alias _='sudo'
-
+alias e="$EDITOR"
-#alias g='grep -in'
+alias q='exit'
-
-# Show history
 alias history='fc -l 1'
-
+alias h='history'
-# List direcory contents
+alias j='jobs -l'
-alias lsa='ls -lah'
+alias f='fg'
-alias l='ls -la'
+alias gr='grep -r'
-alias ll='ls -l'
+alias get='curl -C - -O'
-alias sl=ls # often screw this up
-
 alias afind='ack-grep -il'
+alias type='type -a'
+alias ssh='ssh -X'
+alias print-path='echo -e ${PATH//:/\\n}'
+alias print-libpath='echo -e ${LD_LIBRARY_PATH//:/\\n}'
+alias lsbom='lsbom -f -l -s -pf'
+alias t="$HOME/.local/bin/t --task-dir ~/.tasks --list todo.txt --delete-if-empty"
+
+if [[ -x "${commands[htop]}" ]]; then
+  alias top=htop
+else
+  alias topm='top -o vsize'
+  alias topc='top -o cpu'
+fi
+
+[[ "$DISABLE_COLOR" != 'true' ]] && {
+  [[ -x "${commands[colordiff]}" ]] && alias diff='colordiff'
+  [[ -x "${commands[colormake]}" ]] && alias make='colormake'
+}
+
+# Screen
+# ------------------------------------------------------------------------------
+[[ "$TERM" == 'xterm-color'  && -e "$HOME/.screenrc" ]] && screenrc="-c '$HOME/.screenrc'"
+[[ "$TERM" == 'xterm-256color' && -e "$HOME/.screenrc256" ]] && screenrc="-c '$HOME/.screenrc256'"
+alias screen="screen $screenrc"
+alias sl="screen $screenrc -list"
+alias sr="screen $screenrc -a -A -U -D -R"
+alias S="screen $screenrc -U -S"
+
+# TMUX
+# ------------------------------------------------------------------------------
+[[ "$TERM" == 'xterm-color' && -e "$HOME/.tmux.conf" ]] && tmuxconf="-f '$HOME/.tmux.conf'"
+[[ "$TERM" == 'xterm-256color' && -e "$HOME/.tmux256.conf" ]] && tmuxconf="-f '$HOME/.tmux256.conf'"
+alias tmux="tmux $tmuxconf"
+alias tls="tmux list-sessions"
 

lib/functions.zsh

@@ -15,3 +15,50 @@ function take() {
   cd $1
 }
 
+function cdll() {
+  if [[ -n "$1" ]]; then
+    builtin cd "$1"
+    ls -lFhA
+  else
+    ls -lFhA
+  fi
+}
+
+function pushdll() {
+  if [[ -n "$1" ]]; then
+    builtin pushd "$1"
+    ls -lFhA
+  else
+    ls -lFhA
+  fi
+}
+
+function popdll() {
+  builtin popd
+  ls -lFhA
+}
+
+function grab() {
+  sudo chown -R ${USER} ${1:-.}
+}
+
+function reload() {
+  source "$HOME/.zshrc"
+}
+
+function calc() {
+  echo "scale=4; $@" | bc -l
+}
+
+function pmine() {
+  ps $@ -u $USER -o pid,%cpu,%mem,command
+}
+
+function findexec() {
+  find . -type f -iname '*'${1:-}'*' -exec ${2:-file} {} \;
+}
+
+function httpserve() {
+  python -m SimpleHTTPServer
+}
+

lib/grep.zsh

@@ -1,4 +1,8 @@
 if [[ "$DISABLE_COLOR" != "true" ]]; then
-    [[ -z "$GREP_OPTIONS" ]] && export GREP_OPTIONS='--color=auto'
+  export GREP_OPTIONS='--color=auto'
-    [[ -z "$GREP_COLOR" ]] && export GREP_COLOR='1;32'
+  export GREP_COLOR='37;45'
+else
+  export GREP_OPTIONS='--color=none'
+  export GREP_COLOR=''
 fi
+

oh-my-zsh.sh

@@ -11,9 +11,6 @@ if [ "$TERM" = "dumb" ]; then
   DISABLE_COLOR="true"
 fi
 
-# add a function path
-fpath=($ZSH/functions $ZSH/completions $fpath)
-
 # Load all of the config files in ~/oh-my-zsh that end in .zsh
 # TIP: Add files you don't want in git to .gitignore
 for config_file ($ZSH/lib/*.zsh) source $config_file
@@ -28,16 +25,11 @@ compinit -i
 
 # Load all of the plugins that were defined in ~/.zshrc
 for plugin ($plugins); do
-  if [ -f $ZSH/custom/plugins/$plugin/$plugin.plugin.zsh ]; then
+  if [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]; then
-    source $ZSH/custom/plugins/$plugin/$plugin.plugin.zsh
-  elif [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]; then
     source $ZSH/plugins/$plugin/$plugin.plugin.zsh
   fi
 done
 
-# Load all of your custom configurations from custom/
-for config_file ($ZSH/custom/*.zsh) source $config_file
-
 # Load the theme
 if [ "$ZSH_THEME" = "random" ]
 then