zsh,bash: move aliases to $XDG_CONFIG_HOME

[dotfiles.git] / zshrc

diff --git a/zshrc b/zshrc
index 6f8f6a3a12de5d57e830e196498abce22ad1e026..41c274749e86718011998531fa9d024cebe481c8 100644 (file)
--- a/zshrc
+++ b/zshrc
@@ -1,65 +1,58 @@
-# configure history
-HISTFILE=~/.histfile
-HISTSIZE=1000
-SAVEHIST=2000
-setopt hist_ignore_dups
-setopt hist_ignore_space
-setopt append_history
-setopt inc_append_history
-setopt extended_history
+# 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_CACHE" ]] && echo "Missing cache dir: '$ZSH_CACHE'" && return

 
 

-# misc
-setopt beep
+# Load all of the config files in $ZSH/lib that end in .zsh
+for config_file ($ZSH/lib/*.zsh); do
+  source $config_file
+done
+
+# Set name of the theme to load.
+# Look in $ZSH/themes
+ZSH_THEME="ramsi"
+[[ -f "$ZSH/themes/${ZSH_THEME}.zsh-theme" ]] && source "$ZSH/themes/${ZSH_THEME}.zsh-theme"
+
+# load my functions
+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
+
+# initialise completion
+[[ -d "$ZSH_CACHE" ]] || mkdir -p "$ZSH_CACHE"
+autoload -U compinit; compinit -d "$ZSH_CACHE/zcompdump"
+
+# miscelaneous options

 setopt extendedglob
 setopt extendedglob

-setopt nomatch
+setopt cshnullglob  # if glob does not match, remove pattern, if no glob matches print error
+setopt numeric_glob_sort # sort numerically not lexically

 setopt noclobber    # don't allow overwriting files with '>', use '>!' instead
 setopt notify
 setopt rcquotes     # echo 'don''t'; prints don't
 setopt noclobber    # don't allow overwriting files with '>', use '>!' instead
 setopt notify
 setopt rcquotes     # echo 'don''t'; prints don't

-
-# key bindings
-bindkey -e  # emacs key bindings, vi is weird
-[[ -r ~/.zsh/bindkeyrc ]] && source ~/.zsh/bindkeyrc
-
-# Completion
-zstyle :compinstall filename '/home/ramsi/.zshrc'
-zstyle ':completion:*' list-colors ''
-
-setopt complete_in_word     # allow completion in the middle of a word
-autoload -Uz compinit
-compinit
+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 ~/bin ]] && path=(~/bin $path)

-
-# load my functions
-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 /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
 
 # source aliases

-[[ -f ~/.aliasesrc ]] && source ~/.aliasesrc
-
-# set up prompt
-autoload -U colors && colors
-[[ $(hostname) == "tardis" ]] && hostcolor=red
-[[ $(hostname) == "shada" ]]  && hostcolor=green
-PROMPT="%(?..%{$fg_bold[white]%}[%?])%{$reset_color%}[%D{%k:%M} %n@%{$fg[$hostcolor]%}%m%{$reset_color%}]%# "
-RPROMPT="%{$fg[green]%}%~%{$reset_color%}"
-
-# make cd act like pushd
-DIRSTACKSIZE=10          # number of dirs to remember
-setopt auto_pushd        # cd acts like pushd
-setopt pushd_minus       # inverts the meaning of cp -1 and cp +1
-setopt pushd_silent      # don't print dir stack everytime
-setopt pushd_to_home     # pushd with no argumens pushes to ~
-setopt pushd_ignore_dups # ignore dups in pushd/cd
-alias dh='dirs -v'       # show numbers with dirs
+[[ -f ~/$XDG_CONFIG_HOME/aliases ]] && source ~/$XDG_CONFIG_HOME/aliases
+for alias_file ($ZSH/aliases/*.zsh); do
+  source $alias_file
+done

 
 

-setopt auto_cd           # if no command matches the input, try to cd into it; .. = cd ..
+# 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

 
 

-# set search path for cd
-cdpath=(~ /mnt)
+# default browser
+export BROWSER=dwb

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


@@ -68,3 +61,14 @@ hash -d src=~/src
 hash -d chroot_testing=/buildsystem/testing/buildroot
 hash -d chroot_master=/buildsystem/master/buildroot
 hash -d chroot_lib32=/buildsystem/lib32/buildroot
 hash -d chroot_testing=/buildsystem/testing/buildroot
 hash -d chroot_master=/buildsystem/master/buildroot
 hash -d chroot_lib32=/buildsystem/lib32/buildroot

+hash -d wineprefixes=/mnt/data/wineprefixes
+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