X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/e222be64adcc1eca53ee7c86d6f6f556413b7916..b52718f9143ea84d9f5c511664a1c5ec335cac6f:/zshrc?ds=sidebyside

diff --git a/zshrc b/zshrc
index 6babf77..5604a7c 100644
--- a/zshrc
+++ b/zshrc
@@ -16,7 +16,7 @@ ZSH_THEME="ramsi"
 
 # 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
@@ -40,20 +40,11 @@ typeset -U path     # make path a unique array
 [[ -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
 
-# 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
@@ -66,9 +57,3 @@ hash -d UniMaas=~/dropbox/Documents/UniMaas
 
 # 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