dwb: only open default instance on www-tag

[dotfiles.git] / zshrc

diff --git a/zshrc b/zshrc
index 6babf77fcb22c26e51a952a3abed5ce960632b16..a25e6fb27b4ad98e93a4418b9756f665cf04d7ba 100644 (file)
--- a/zshrc
+++ b/zshrc
@@ -16,11 +16,10 @@ 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 "$ZSH_CACHE" ]] || mkdir -p "$ZSH_CACHE"

 autoload -U compinit; compinit -d "$ZSH_CACHE/zcompdump"
 
 # miscelaneous options
 autoload -U compinit; compinit -d "$ZSH_CACHE/zcompdump"
 
 # miscelaneous options


@@ -36,24 +35,14 @@ setopt dvorak       # correct_all uses dvorak
 typeset -U path     # make path a unique array
 [[ -d ~/.local/bin ]] && path=(~/.local/bin $path)
 [[ -d ~/bin ]] && path=(~/bin $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
-[[ -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
-
-# 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


@@ -66,9 +55,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