update

5 files changed, 26 insertions, 8 deletions

diff --git a/skel/.Xresources b/skel/.Xresources
index 6985f90..66e0490 100644
--- a/skel/.Xresources
+++ b/skel/.Xresources
@@ -57,11 +57,11 @@ URxvt.colorIT:		green
 URxvt*cursorBlink:	false
 URxvt*underlineColor:	#86a2be
 
-URxvt*font:			xft:Inconsolata For Powerline:regular:size=10:antialias=true
-URxvt*imFont:		xft:Inconsolata For Powerline:regular:size=10:antialias=true
-URxvt*boldFont:		xft:Inconsolata For Powerline:bold:size=10:antialias=true
-URxvt*italicFont:	xft:Inconsolata For Powerline:italic:size=10:antialias=true
-URxvt*boldItalicFont:	xft:Inconsolata For Powerline:bold:italic:size=10:antialias=true
+URxvt*font:			xft:Inconsolata For Powerline:regular:size=12:antialias=true
+URxvt*imFont:		xft:Inconsolata For Powerline:regular:size=12:antialias=true
+URxvt*boldFont:		xft:Inconsolata For Powerline:bold:size=12:antialias=true
+URxvt*italicFont:	xft:Inconsolata For Powerline:italic:size=12:antialias=true
+URxvt*boldItalicFont:	xft:Inconsolata For Powerline:bold:italic:size=12:antialias=true
 
 URxvt*scrollBar:	false
 URxvt*jumpScroll:	false
diff --git a/skel/.gitignore b/skel/.gitignore
index c2fa64f..157c72d 100644
--- a/skel/.gitignore
+++ b/skel/.gitignore
@@ -3,5 +3,7 @@
 *.class
 .*.swp
 *.pyc
+*.pyo
+__pycache__/
 *.log
 *.pc
diff --git a/skel/.tmux.conf b/skel/.tmux.conf
index 41cbbf6..de2cf48 100644
--- a/skel/.tmux.conf
+++ b/skel/.tmux.conf
@@ -15,9 +15,15 @@ set-option -sg  escape-time 0
 set-option -g   repeat-time 500
 
 set-option -g   history-limit 16000
-set-option -g   default-terminal screen-256color
+#set-option -g   default-terminal screen-256color
+set-option -g   default-terminal rxvt
 
-set-option -g   monitor-activity on
+# loud or quiet?
+set-option -g visual-activity off
+set-option -g visual-bell off
+set-option -g visual-silence off
+set-window-option -g monitor-activity on
+set-option -g bell-action none
 
 # mouse options changed in v2.1
 # enable mouse support
@@ -45,3 +51,11 @@ set-option -g status-left-length 32
 set-option -g status-right '][ load #(cut -d " " -f 1-3 /proc/loadavg) ][ %Y-%m-%d %H:%M ]'
 set-option -g status-right-length 48
 
+# don't rename windows automatically
+#set-option -g allow-rename off
+
+# switch panes using Alt-arrow without prefix
+bind -n M-Left select-pane -L
+bind -n M-Right select-pane -R
+bind -n M-Up select-pane -U
+bind -n M-Down select-pane -D
diff --git a/skel/.vim/vimrc b/skel/.vim/vimrc
index dc1b362..816034c 100644
--- a/skel/.vim/vimrc
+++ b/skel/.vim/vimrc
@@ -219,6 +219,7 @@ autocmd BufNew,BufRead *.java inoremap <tab> <C-R>=My_TabComplete()<CR>
 autocmd BufNewFile,BufRead /home/astra/dev/tuwien/effprog_2013/*.[ch] set shiftwidth=2 softtabstop=2 expandtab
 autocmd BufNewFile,BufRead *.rb set shiftwidth=2 softtabstop=2 expandtab
 autocmd BufNewFile,BufRead *.py set shiftwidth=4 softtabstop=4 expandtab
+autocmd BufNewFile,BufRead *.yml set shiftwidth=2 softtabstop=2 expandtab
 
 map <F8> :!/usr/bin/ctags -R --c++-kinds=+p --fields=+iaS --extra=+q .<CR>
 
diff --git a/skel/.zshrc.local b/skel/.zshrc.local
index 100b8f9..ba8bf1a 100644
--- a/skel/.zshrc.local
+++ b/skel/.zshrc.local
@@ -86,7 +86,8 @@ if main_node; then
 	alias padon='/usr/bin/xinput enable "SynPS/2 Synaptics TouchPad"'
 	alias snownews="snownews -u"
 	alias biew="TERM=vt100 biew"
-	exec_exists pm-suspen && alias vsuspend="sudo pm-suspend"
+	alias urxvt="urxvt256c"
+	exec_exists pm-suspend && alias vsuspend="sudo pm-suspend"
 	exec_exists trash && alias rm="trash"
 	exec_exists tmux && alias tmuxattach="tmux new -As default"