update zshrc

1 files changed, 70 insertions, 36 deletions

diff --git a/skel/.zshrc.local b/skel/.zshrc.local
index 8043622..7b485fa 100644
--- a/skel/.zshrc.local
+++ b/skel/.zshrc.local
@@ -24,6 +24,9 @@ compinit
 autoload colors
 colors
 
+autoload -Uz promptinit
+promptinit
+
 zstyle ':completion:*:*:(^rm):*:*files' ignored-patterns '*?.o' '*?.c~' '*?.old' '*?.pro' '*?.class'
 
 # add ~/bin to path
@@ -31,54 +34,85 @@ if ! [[ $PATH =~ "${HOME}/bin" ]]; then
 	PATH="${PATH}:${HOME}/bin"
 fi
 
+exec_exists() { type -p $1 &>/dev/null }
+exec_exists hostname && HOSTNAME=`hostname`
+main_node() { [[ "$HOSTNAME" == "achelois" ]] }
+
 # Vars used later on by Zsh
 export EDITOR="vim -p"
-export BROWSER="links"
+export PAGER="less"
 
 # command B equivalent to command &> /dev/null &
 alias -g B='&> /dev/null &'
 
 export PYTHONSTARTUP=~/.pythonrc
-export BATTERY=0
+
+if main_node; then
+	export PATH=/home/astra/var/AndroidSDK/sdk/platform-tools:$PATH
+
+	export BROWSER="firefox"
+
+	export BATTERY=1
+	export XDG_CURRENT_DESKTOP=kde
+else
+	export BROWSER="links"
+	export BATTERY=0
+fi
 
 alias vim="vim -p"
-alias diff="colordiff -u"
+alias gvim="gvim -p"
+alias e="gvim -p"
+alias v="gvim -p"
+alias g="git"
+exec_exists colordiff && alias diff="colordiff -u"
 alias vimdiff="vimdiff -c 'map q :qa!<CR>'"
 alias grep="grep -i"
-alias gnuplot="gnuplot -persist"
-alias padoff="/usr/bin/synclient TouchpadOff=1"
-alias padon="/usr/bin/synclient TouchpadOff=0"
 alias cp="cp -i"
 alias nano="nano -w"
-#alias ls="ls --color=auto"
-alias snownews="snownews -u"
 alias route6="route -Ainet6"
 
-alias biew="TERM=vt100 biew"
-alias pushd_list='pushd "$@"'
-
-# just press 'asdf' keys to toggle between dvorak and us keyboard layout
-asdf() {
-	echo -n 'Switching to us keyboard layout: '
-	[[ -z "$DISPLAY" ]] && $SUDO loadkeys us &>/dev/null || setxkbmap us &>/dev/null
-	echo 'Done'
-}
-# just press 'asdf' key to toggle from neon layout to us keyboard layout
-fdsa() {
-	echo -n 'Switching to de keyboard layout: '
-	[[ -z "$DISPLAY" ]] && $SUDO loadkeys de &>/dev/null || setxkbmap de &>/dev/null
-	echo 'Done'
-}
-
-neo() {
-	echo -n 'Switching to neo keyboard layout: '
-	[[ -z "$DISPLAY" ]] && $SUDO loadkeys de neo &>/dev/null || setxkbmap de neo -option &>/dev/null
-	echo 'Done'
-}
-eaiu() {
-	echo -n 'Switching to us keyboard layout: '
-	[[ -z "$DISPLAY" ]] && $SUDO loadkeys us &>/dev/null || setxkbmap us &>/dev/null
-	echo 'Done'
-}
-
-[[ ! -z "$DISPLAY" ]] && [ -n "$WINDOWID" ] && type transset-df &>/dev/null && transset-df -i $WINDOWID 0.9 >/dev/null || true
+if main_node; then
+	alias gnuplot="gnuplot -persist"
+	alias padoff="/usr/bin/synclient TouchpadOff=1"
+	alias padon="/usr/bin/synclient TouchpadOff=0"
+	alias snownews="snownews -u"
+	alias cvlc="cvlc --ffmpeg-hw"
+	alias vlc="vlc --ffmpeg-hw"
+	alias biew="TERM=vt100 biew"
+	exec_exists pm-suspen && alias vsuspend="sudo pm-suspend"
+	exec_exists trash && alias rm="trash"
+	exec_exists tmux && alias tmuxattach="tmux new -As default"
+
+	alias pushd_list='pushd "$@"'
+	alias wine32='WINEARCH=win32 WINEPREFIX=/home/astra/.wine32 wine'
+	alias mc='ssh -p666 dev.somenet.org -L 25565:10.10.0.253:25565'
+	#alias xflux="/home/astra/git/f.lux/xflux -l 48.21 -g 16.37"
+fi
+
+if main_node; then
+	# just press 'asdf' keys to toggle between dvorak and us keyboard layout
+	asdf() {
+		echo -n 'Switching to us keyboard layout: '
+		[[ -z "$DISPLAY" ]] && $SUDO loadkeys us &>/dev/null || setxkbmap us &>/dev/null
+		echo 'Done'
+	}
+	# just press 'asdf' key to toggle from neon layout to us keyboard layout
+	fdsa() {
+		echo -n 'Switching to de keyboard layout: '
+		[[ -z "$DISPLAY" ]] && $SUDO loadkeys de &>/dev/null || setxkbmap de &>/dev/null
+		echo 'Done'
+	}
+
+	neo() {
+		echo -n 'Switching to neo keyboard layout: '
+		[[ -z "$DISPLAY" ]] && $SUDO loadkeys de neo &>/dev/null || setxkbmap de neo -option &>/dev/null
+		echo 'Done'
+	}
+	eaiu() {
+		echo -n 'Switching to us keyboard layout: '
+		[[ -z "$DISPLAY" ]] && $SUDO loadkeys us &>/dev/null || setxkbmap us &>/dev/null
+		echo 'Done'
+	}
+fi
+
+[[ ! -z "$DISPLAY" ]] && [ -n "$WINDOWID" ] && exec_exists transset-df && transset-df -i $WINDOWID 0.9 >/dev/null || true