Merge branch 'master' of tardis:dotfiles

[dotfiles.git] / zshrc

diff --git a/zshrc b/zshrc
index 7ad8443cfc8191eb977a4336e035d76e74709e6d..e6126f22c2ff7b6c66179bb24a42e624d673ab17 100644 (file)
--- a/zshrc
+++ b/zshrc
@@ -1,6 +1,8 @@
 # Path to config files
 ZSH=$XDG_CONFIG_HOME/zsh
 # Path to config files
 ZSH=$XDG_CONFIG_HOME/zsh

+ZSH_CACHE=$XDG_CACHE_HOME/zsh

 [[ ! -d "$ZSH" ]] && echo "Missing config dir: '$ZSH'" && return
 [[ ! -d "$ZSH" ]] && echo "Missing config dir: '$ZSH'" && return

+[[ ! -d "$ZSH_CACHE" ]] && echo "Missing cache dir: '$ZSH_CACHE'" && return

 
 # Load all of the config files in $ZSH/lib that end in .zsh
 for config_file ($ZSH/lib/*.zsh); do
 
 # Load all of the config files in $ZSH/lib that end in .zsh
 for config_file ($ZSH/lib/*.zsh); do


@@ -14,12 +16,11 @@ ZSH_THEME="ramsi"
 
 # load my functions
 typeset -U fpath    # make fpath a unique array
 
 # load my functions
 typeset -U fpath    # make fpath a unique array

-[[ -d ~/.zsh/functions ]] && fpath=(~/.zsh/functions $fpath)
+[[ -d $ZSH/functions ]] && fpath=($ZSH/functions $fpath)

 autoload -U ${fpath[1]}/*(:t)   # loads all functions in the first element of fpath
 
 # initialise completion
 autoload -U ${fpath[1]}/*(:t)   # loads all functions in the first element of fpath
 
 # initialise completion

-[[ -d "$XDG_CACHE_HOME/zsh" ]] || mkdir -p "$XDG_CACHE_HOME/zsh"
-autoload -U compinit; compinit -d "$XDG_CACHE_HOME/zsh/zcompdump"
+autoload -U compinit; compinit -d "$ZSH_CACHE/zcompdump"

 
 # miscelaneous options
 setopt extendedglob
 
 # miscelaneous options
 setopt extendedglob


@@ -30,24 +31,22 @@ setopt notify
 setopt rcquotes     # echo 'don''t'; prints don't
 setopt dvorak       # correct_all uses dvorak
 
 setopt rcquotes     # echo 'don''t'; prints don't
 setopt dvorak       # correct_all uses dvorak
 

+# disable flow control
+setopt noflowcontrol
+stty -ixon
+

 # populate path
 typeset -U path     # make path a unique array
 [[ -d ~/.local/bin ]] && path=(~/.local/bin $path)
 [[ -d ~/bin ]] && path=(~/bin $path)
 # populate path
 typeset -U path     # make path a unique array
 [[ -d ~/.local/bin ]] && path=(~/.local/bin $path)
 [[ -d ~/bin ]] && path=(~/bin $path)

-[[ -d /extra ]] && path=($path /extra/bin /extra/usr/bin /extra/sbin /extra/usr/sbin)

 [[ -d /opt/android-sdk ]] && path=($path /opt/android-sdk/platform-tools)
 
 # source aliases
 [[ -d /opt/android-sdk ]] && path=($path /opt/android-sdk/platform-tools)
 
 # source aliases

-[[ -f ~/.aliases ]] && source ~/.aliases
+[[ -f $XDG_CONFIG_HOME/aliases ]] && source $XDG_CONFIG_HOME/aliases

 for alias_file ($ZSH/aliases/*.zsh); do
   source $alias_file
 done
 
 for alias_file ($ZSH/aliases/*.zsh); do
   source $alias_file
 done
 

-# vim stuff
-export EDITOR=vim
-export VISUAL=vim
-export BROWSER=dwb
-

 # set up a few named directories
 hash -d Skaro=/mnt/Skaro
 hash -d ccr=~/ccr
 # set up a few named directories
 hash -d Skaro=/mnt/Skaro
 hash -d ccr=~/ccr


@@ -60,9 +59,3 @@ hash -d UniMaas=~/dropbox/Documents/UniMaas
 
 # set some env variables
 export _gamedir=/mnt/Skaro/Games/Linux/HumbleBundle
 
 # set some env variables
 export _gamedir=/mnt/Skaro/Games/Linux/HumbleBundle

-
-# ros
-if [[ -f "/opt/ros/groovy/setup.zsh" ]]; then
-    export ROS_WORKSPACE=~/src/ros
-    export ROS_OS_OVERRIDE=arch
-fi