Commits

Tobias Langhoff committed 8fea711

indent update

Comments (0)

Files changed (2)

     alias vball='vb c107 c203 c205 c207 c210 tvV driftV vbp'
 elif [[ $(domainname) == "ping" ]]; then
     PS1='${debian_chroot:+($debian_chroot)}'$LIGHT_CYAN'\u@\h\[\033[00m\]:\[\033[0;34m\]\w\[\033[00m\] \$ '
-elif [[ $(domainname) == "uio" ]]; then
+elif [[ $(domainname) == "uio" || $HOSTNAME == $kontormaskin ]]; then
     PS1='${debian_chroot:+($debian_chroot)}'$LIGHT_GRAY'\u@\h\[\033[00m\]:\[\033[0;34m\]\w\[\033[00m\] \$ '
-    export PATH=$PATH':~/bin/wine-1.1.39:/usr/bin/:/sbin/:/local/sbin:/local/bin:/usr/sbin:/store/sbin/:bin'
+    export PATH='~/bin/wine-1.1.39:/sbin/:/local/sbin:/usr/bin/:/local/bin:/usr/sbin:/store/sbin/:bin:'$PATH
     alias ldap='ldapsearch -x -H "ldap://ldap.uio.no/" -b "cn=targets,cn=mail,dc=uio,dc=no" mail=mailadr'
     alias irssi='/usr/bin/irssi'
     export CVS_RSH=ssh
 " indenting (note: I hate tabs and love spaces, comment out accordingly)
 set autoindent      " auto-indent new lines
 set smartindent     " auto-indent things in braces
+set smarttab
 set expandtab       " away with those pesky tabs
 set shiftwidth=4    " number of spaces per indent level
 set softtabstop=4   " number of spaces to e.g. delete with backspace
 set cindent         " auto-indent things in braces, loops, conditions, etc.
 set formatoptions+=ro " keep indenting block comments
 match errorMsg /[\t]/ " highlight all tab characters as errors
-"set shiftround
+set shiftround
 
 " LaTeX-suite, see http://vim-latex.sourceforge.net/
 set iskeyword+=:    " for \ref{fig: CTRL+N