Merge branch 'master' of framagit.org:mpo/dotfiles

configure

@@ -62,6 +62,14 @@ case $1 in
     stow -v zsh
     echo "You can add your local config in ~/.zsh-local-$HOST"
     ;;
+  "dircolors"   )
+    echo "Installing dircolors config"
+    git clone https://github.com/seebi/dircolors-solarized ~/.dircolors
+    ln -s ~/.dircolors/dircolors.ansi-dark ~/.dir_colors
+    echo "Default dircolors theme is dark ansi"
+    echo "Please check that your terminal emulator is listed at the begining"
+    echo "of the file like so: TERM xterm-termite (for termite)"
+    ;;
   *             )
     echo "$1 cannot be installed…"
     exit 1

scripts/prefix/bin/vpn

@@ -1,5 +1,13 @@
 #!/bin/sh
 
+HARDPROFILE="2947fbbad4"
+if [[ $(hostname) == "DeathStar" ]]
+then
+  OODPROFILE="OodDeathStar"
+else
+  OODPROFILE="OodCanine"
+fi
+
 if [[ $# -ne 1 ]]
 then
   echo "$(basename $0) requires exactly one of: hard, medium, off"
@@ -7,10 +15,10 @@ then
 else
   case $1 in
     "hard")
-      PROFILE="2947fbbad4"
+      PROFILE=$HARDPROFILE
       ;;
     "medium")
-      [[ $(hostname) == "DeathStar" ]] && PROFILE="OodDeathStar" || PROFILE="OodCanine"
+      PROFILE=$OODPROFILE
       ;;
     "off")
       ;;
@@ -20,14 +28,16 @@ else
       ;;
   esac
 
-  sudo systemctl stop openvpn@2947fbbad4.service
-  sudo systemctl stop openvpn@OodCanine.service
+  sudo systemctl stop openvpn@$HARDPROFILE.service
+  sudo systemctl stop openvpn@$OODPROFILE.service
   sleep 1s
 
   if [[ -n $PROFILE ]]
   then
     sudo systemctl start openvpn@$PROFILE.service
-  fi
     echo "$PROFILE started"
+  else
+    echo "All stopped."
+  fi
 fi
 

vim/.vim/.netrwhist

@@ -0,0 +1,6 @@
+let g:netrw_dirhistmax  =10
+let g:netrw_dirhist_cnt =4
+let g:netrw_dirhist_1='/home/eeva/teaching/2015-ATER/ASR/TP26'
+let g:netrw_dirhist_2='/home/eeva/.config/termite'
+let g:netrw_dirhist_3='/home/eeva/work/OTB2.demo'
+let g:netrw_dirhist_4='/etc/X11/xorg.conf.d'

zsh/.zshrc

@@ -4,7 +4,7 @@ export ZSH=$HOME/.oh-my-zsh
 # Default plugins (used everywhere)
 plugins=(git systemd)
 
-ZSH_THEME="lambda"
+ZSH_THEME="zhann"
 source $ZSH/oh-my-zsh.sh
 
 export EDITOR='vim'
@@ -31,3 +31,7 @@ if [ -f "$HOME/.zsh-local-$HOST" ]; then
   source $HOME/.zsh-local-$HOST
 fi
 
+# Colors files (if file exists
+if [ -f "$HOME/.dir_colors" ]; then
+  eval `dircolors ~/.dir_colors`
+fi