Merge branch 'dev' into 'master'

add screenrc, update vimrc, zshrc

- add screenrc with status bar
- manage tabs in vimrc
- fix aliases source in zshrc

See merge request !3

makesymlinks.sh

@@ -6,7 +6,9 @@
 
 dir=~/dotfiles          	# dotfiles directory
 olddir=~/dotfiles_old   	# old dotfiles backup directory
-files="bashrc vimrc zshrc"    	# list of files/folders to symlink in homedir
+
+# list of files/folders to symlink in homedir
+files="bashrc vimrc zshrc screenrc"
 
 # create dotfiles_old in homedir
 echo "Creating $olddir for backup of any existing dotfiles in ~"

screenrc

@@ -0,0 +1,20 @@
+term screen-256color
+bind ',' prev
+bind ';' next
+
+# Fix for residual text
+altscreen on
+
+# custom statusbar
+hardstatus off
+hardstatus alwayslastline
+hardstatus string '%{= kW}[ %{m}%H %{W}][%= %{= kw}%?%-Lw%?%{r}(%{g}%n*%f%t%?(%u)%?%{r})%{w}%?%+Lw%?%?%= %{W}][%{Y} %d/%m %{Y}%c %{W}]'
+
+# Turn welcome message off
+startup_message off
+
+# disable vbell (so wm urgency hints can work from within screen)
+vbell off
+
+# Increase the scrollback buffer
+defscrollback 5000

vimrc

@@ -2,3 +2,11 @@ execute pathogen#infect()
 syntax on
 filetype plugin indent on
 colors molokai
+let g:airline_powerline_fonts = 1
+filetype plugin indent on
+" show existing tab with 4 spaces width
+set tabstop=4
+" when indenting with '>', use 4 spaces width
+set shiftwidth=4
+" On pressing tab, insert 4 spaces
+set expandtab

zshrc

@@ -83,4 +83,4 @@ source $ZSH/oh-my-zsh.sh
 # Example aliases
 # alias zshconfig="mate ~/.zshrc"
 # alias ohmyzsh="mate ~/.oh-my-zsh"
-source .bash_aliases
+source ~/.bash_aliases