Merge branch 'master' into wsr_shared

Gina doesn't like them

.gitconfig

@@ -1,6 +1,3 @@
-[user]
-	name = Peter J. Holzer
-	email = hjp@wsr.ac.at
 [alias]
 	co = checkout
 	ci = commit

.vim/colors/hjp-dark.vim

@@ -12,8 +12,7 @@ if exists("syntax_on")
 endif
 let g:colors_name = "hjp-dark"
 
-hi ColorColumn                                                   ctermbg=238
+hi Comment    term=bold                      ctermfg=88          ctermbg=White                  guifg=Red
-hi Comment    term=bold                      ctermfg=246         ctermbg=Black                  guifg=Red
 hi Constant   term=underline                 ctermfg=201                                        guifg=Magenta
 hi Error      term=reverse                   ctermfg=15          ctermbg=9                      guifg=White    guibg=Red 
 hi ErrorMsg   term=standout     cterm=NONE   ctermfg=226         ctermbg=DarkRed  gui=NONE      guifg=Yellow   guibg=DarkRed
@@ -24,7 +23,7 @@ hi Normal
 hi PreProc    term=underline                 ctermfg=Magenta     ctermbg=0                      guifg=Purple
 hi Search     term=reverse   cterm=NONE      ctermfg=White       ctermbg=19       gui=NONE      guifg=Black    guibg=Cyan
 hi Special    term=bold                      ctermfg=Yellow      ctermbg=NONE                   guifg=Magenta
-hi Statement  term=bold                      ctermfg=117                          gui=NONE      guifg=Brown
+hi Statement  term=bold                      ctermfg=105                          gui=NONE      guifg=Brown
 hi Underlined term=underline cterm=underline ctermfg=163                          gui=underline guifg=SlateBlue
 
 " Use color 226 (pale yellow) instead of the default yellow, because I refined

.vimrc

@@ -1,7 +1,6 @@
 set ai
 " Disable (ab)use of X11 selection
 set clipboard=
-set colorcolumn=72,80,100,132
 set comments=s1:/*,mb:*,ex:*/,://,b:#,:%,:XCOMM,n:>,fb:-,n:\|
 set expandtab
 set exrc
@@ -19,7 +18,6 @@ set scrolloff=5
 set secure
 set sm
 set sw=4
-set tw=72
 set viminfo='100,<50,s10,h,%
 
 if has('reltime')
@@ -27,10 +25,11 @@ if has('reltime')
 endif
 
 if $BG == "light"
-    set bg=light
     colorscheme hjp
+    set bg=light
     syntax on
 elseif $BG == "dark"
+    colorscheme default
     set bg=dark
     colorscheme hjp-dark
     syntax on

.zshenv

@@ -243,10 +243,6 @@ case "$FQDN" in
         then
             export GIT_AUTHOR_EMAIL="$LOGNAME@wsr.ac.at"
         fi
-        if [ -z "$GIT_AUTHOR_NAME" ]
-        then
-            export GIT_AUTHOR_NAME="Peter J. Holzer"
-        fi
 	;;
    *.hjp.at)
         if [ -z "$GIT_AUTHOR_EMAIL" ]

.zshrc

@@ -152,10 +152,3 @@ fi
 # for new style completion:
 autoload -U compinit
 compinit
-
-# NVM
-if [ -d "$HOME/.nvm" ]
-then
-    export NVM_DIR="$HOME/.nvm"
-    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
-fi