diff --git a/.gitconfig b/.gitconfig
index 51e3d04..08892cf 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -17,6 +17,7 @@
 	out    = log --branches --not --remotes
 	inc    = log ..@{u}
 	vimdiff = difftool -y -t vimdiff
+	serve   = instaweb
 
 	# tricks from https://www.durdn.com/blog/2012/11/22/must-have-git-aliases-advanced-examples/
 	# if no file is specified, show diff for all files in the changeset
@@ -29,3 +30,11 @@
 
 [merge]
 	tool = vimdiff
+
+
+[instaweb]
+        local = true
+        ; httpd = apache2 -f
+        ; port = 4321
+        ; browser = konqueror
+        ; modulePath = /usr/lib/apache2/modules
diff --git a/.zshrc b/.zshrc
index 84dbce8..e2bb526 100644
--- a/.zshrc
+++ b/.zshrc
@@ -96,10 +96,35 @@ source $ZSH/oh-my-zsh.sh
 
 # User configuration
 
+# remove some stupid aliases from common-aliases
+alias rm >/dev/null && unalias rm
+
 # if on macos:
 if [[ "$OSTYPE" == "darwin"* ]]; then
     touch /tmp/darwin
     export LSCOLORS=gxfxbEaEBxxEhEhBaDaCaD
+
+    # route man through vim
+    export MANPAGER='col -bx | view -c ":set ft=man nonu nolist nomod nolist" -'
+fi
+
+# if on Solaris
+if [[ "$OSTYPE" == "solaris"* ]]; then
+    touch /tmp/solaris
+
+    # common aliases correction
+    unalias ggrep
+
+    # set terminfo
+    if [ ! -f "/usr/share/lib/terminfo/r/rxvt-256color" ]; then
+	    if [ -f "/usr/gnu/share/terminfo/r/rxvt-256color" ]; then
+		    export TERMINFO="/usr/gnu/share/terminfo/r/rxvt-256color"
+	    else
+		    if [ -f "$HOME/.terminfo" ]; then
+			    export TERMINFO=$HOME/.terminfo
+		    fi
+	    fi
+    fi
 fi
 
 
@@ -127,9 +152,6 @@ fi
 # alias zshconfig="mate ~/.zshrc"
 # alias ohmyzsh="mate ~/.oh-my-zsh"
 
-# common aliases defines rm -i - that drives me nuts
-unalias rm
-
 # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
 [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
 # test -e /Users/jetpac/.iterm2_shell_integration.zsh && source /Users/jetpac/.iterm2_shell_integration.zsh || true