dwb: cleanup bookmarks

[dotfiles.git] / zshrc

diff --git a/zshrc b/zshrc
index df14759a33abf109f7ea4126cdc21b2ed3c55a1e..2e6048a159e5b72707943443366467eb524e8349 100644 (file)
--- a/zshrc
+++ b/zshrc
@@ -1,5 +1,6 @@
-# Path to your oh-my-zsh configuration.
-ZSH=$HOME/.zsh
+# Path to config files
+ZSH=$XDG_CONFIG_HOME/zsh
+[[ ! -d "$ZSH" ]] && echo "Missing config dir: '$ZSH'" && 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


@@ -16,7 +17,9 @@ typeset -U fpath    # make fpath a unique array
 [[ -d ~/.zsh/functions ]] && fpath=(~/.zsh/functions $fpath)
 autoload -U ${fpath[1]}/*(:t)   # loads all functions in the first element of fpath
 
 [[ -d ~/.zsh/functions ]] && fpath=(~/.zsh/functions $fpath)
 autoload -U ${fpath[1]}/*(:t)   # loads all functions in the first element of fpath
 

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

 
 # miscelaneous options
 setopt extendedglob
 
 # miscelaneous options
 setopt extendedglob


@@ -29,6 +32,7 @@ setopt dvorak       # correct_all uses dvorak
 
 # populate path
 typeset -U path     # make path a unique array
 
 # 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)
 [[ -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)


@@ -40,9 +44,14 @@ for alias_file ($ZSH/aliases/*.zsh); do
 done
 
 # vim stuff
 done
 
 # vim stuff

+[[ -d "$XDG_CACHE_HOME/vim" ]] || mkdir -p "$XDG_CACHE_HOME/vim"
+export VIMINIT='let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc" | source $MYVIMRC'

 export EDITOR=vim
 export VISUAL=vim
 
 export EDITOR=vim
 export VISUAL=vim
 

+# default browser
+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


@@ -58,7 +67,6 @@ export _gamedir=/mnt/Skaro/Games/Linux/HumbleBundle
 
 # ros
 if [[ -f "/opt/ros/groovy/setup.zsh" ]]; then
 
 # ros
 if [[ -f "/opt/ros/groovy/setup.zsh" ]]; then

-    source /opt/ros/groovy/setup.zsh

     export ROS_WORKSPACE=~/src/ros
     export ROS_OS_OVERRIDE=arch
 fi
     export ROS_WORKSPACE=~/src/ros
     export ROS_OS_OVERRIDE=arch
 fi