.local

4 files changed, 26 insertions, 18 deletions

diff --git a/feh/.fehbg b/feh/.fehbg
index 0ff9934..dbd611e 100644
--- a/feh/.fehbg
+++ b/feh/.fehbg
@@ -1 +1 @@
-feh --no-xinerama --image-bg black --bg-center '/home/pks/var/img/MIPS_R3000A_die-1024x1024.jpg' 
+feh --no-xinerama --image-bg black --bg-center '/home/pks/images/MIPS_R3000A_die-1024x1024.jpg'
diff --git a/ratpoison/.ratpoisonrc b/ratpoison/.ratpoisonrc
index cdc6a51..53933ba 100644
--- a/ratpoison/.ratpoisonrc
+++ b/ratpoison/.ratpoisonrc
@@ -1,8 +1,8 @@
-exec feh --no-xinerama --image-bg black --bg-center '/home/pks/var/img/MIPS_R3000A_die-1024x1024.jpg'
-exec mkdir -p /tmp/pks/.cache /tmp/pks/.ccache /tmp/pks/.local
+exec feh --no-xinerama --image-bg black --bg-center "$HOME/images/MIPS_R3000A_die-1024x1024.jpg"
+exec mkdir -p /tmp/pks/.cache /tmp/pks/.ccache
 exec xmodmap
 exec xbindkeys
-exec ~/bin/urxvtd -q -f -o
+exec ~/.local/bin/urxvtd -q -f -o
 exec xset s 0
 exec xrandr --output VGA-0 --off
 exec imwheel
@@ -11,11 +11,11 @@ exec unclutter -idle 5
 escape F13
 definekey top F14 readkey root
 
-bind Return exec /home/pks/bin/urxvtc --saveLines 10000
+bind Return exec ~/.local/bin/urxvtc --saveLines 10000
 unbind c
 bind C exec /usr/bin/firefox
 bind D exec urxvt -fn 'xft:courier:pixelsize=16' -fg #000000 -bg #ffffff
-bind b exec ratpoison -c "echo $(~/bin/avg_batt)"
+bind b exec ratpoison -c "echo $(~/.local/bin/battery-charge)"
 bind s hsplit
 bind S split
 bind q only
@@ -28,8 +28,8 @@ bind J exchangedown
 bind H exchangeleft
 bind L exchangeright
 bind t time
-bind k exec ~/bin/layout_switch
-bind Cyrillic_el exec ~/bin/layout_switch
+bind k exec ~/.local/bin/layout-switch
+bind Cyrillic_el exec ~/.local/bin/layout-switch
 bind F14 other
 
 defborder 0
diff --git a/vim/.vimrc b/vim/.vimrc
index 819e89d..d2d0406 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -72,5 +72,5 @@ let g:airline_symbols.whitespace        = 'Ξ'
 let g:tagbar_compact = 1
 
 " vimwiki
-let g:vimwiki_list = [{'path':'~/var/wiki'}]
+let g:vimwiki_list = [{'path':'~/wiki'}]
 
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 4120382..f219eef 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -28,10 +28,7 @@ ZDIR=~/.zsh/
 # #############################################################################
 
 umask 0077
-export PATH=~/bin:/home/pks/bin:~/scripts:$PATH
-export PATH=~/lib/ruby/bin:$PATH
-export PATH=~/lib/python/site-packages:$PATH
-export PATH=~/lib/node/bin:$PATH
+export PATH=~/.local/bin:~/scripts:$PATH
 export PATH=/usr/sbin:/usr/local/bin:/usr/local/sbin:$PATH
 
 export EDITOR='vim -p'
@@ -41,10 +38,14 @@ export LANG=en_US.UTF-8
 export LANGUAGE=en_US.UTF-8
 
 export RUBYOPT=-Ku
-export GEM_HOME=$HOME/lib/ruby/
-export GEM_PATH=$HOME/lib/ruby/:$GEM_PATH
+export PATH=~/.local/lib/ruby/bin:$PATH
+export GEM_HOME=$HOME/.local/lib/ruby/
+export GEM_PATH=$HOME/.local/lib/ruby/:$GEM_PATH
 
 export PYTHONPATH=$PYTHONPATH:~/lib/python/site-packages
+export PATH=~/.local/lib/python/site-packages:$PATH
+
+export PATH=~/.local/lib/node/bin:$PATH
 
 export TEXMFHOME='~/.texmf'
 
@@ -52,6 +53,12 @@ export CFLAGS="-march=native -mtune=native"
 export CXXFLAGS="$CFLAGS"
 export CCACHE_PATH=/usr/bin
 
+case `whoami` in
+  root)
+    export PATH=/home/pks/.local/bin:$PATH
+  ;;
+esac
+
 # #############################################################################
 # terminal
 # #############################################################################
@@ -149,7 +156,7 @@ case `hostname` in
     alias tmux="tmux -f ~/.tmux.`hostname`.conf"
   ;;
   x|pi*|*.uberspace.de)
-    PATH=/usr/lib/colorgcc/bin:~/src/scripts:$PATH
+    PATH=/usr/lib/colorgcc/bin:$PATH
   ;;
 esac
 
@@ -210,8 +217,9 @@ alias muxn='tmux new -s'
 alias muxl='tmux list-sessions'
 alias muxa='tmux attach -t'
 
-alias easy_install_home='easy_install --install-dir=$HOME/lib/python/site-packages'
-alias npm_install='npm install -g --prefix ./lib/node'
+alias easy_install_home='easy_install --install-dir=$HOME/.local/lib/python/site-packages'
+alias pip_home='install --install-option="--install-purelib=~/.local/lib/python/site-packages"'
+alias npm_install_home='npm install -g --prefix ~/.local/lib/node'
 
 alias my_ip='echo "$(curl 'https://api.ipify.org' 2>/dev/null)"'