Merge remote-tracking branch 'origin/nix'

zsh/.oh-my-zsh

@@ -1 +1 @@
-Subproject commit 7dcabbe6826073ef6069c8a4b6f9a943f00d2df0
+Subproject commit 6768906d07151140db901510b2c8b1ce2622f365

zsh/.zshrc

@@ -168,6 +168,7 @@ man
 #n98-magerun
 nanoc
 #ng
+#nix
 #nmap
 node
 #nomad
@@ -329,7 +330,6 @@ status() {
 
 alias kbe='setxkbmap be'
 alias kus='setxkbmap us'
-alias meteo='curl -4 http://wttr.in/Roubaix'
 alias dl='wget -r -k -T 5 -t 2 -U '\''Mozilla/5.0 (X11; Linux x86_64; rv:35.0) Gecko/20100101 Firefox/35.0'\'' '
 alias egrep='egrep --color=auto'
 alias fgrep='fgrep --color=auto'
@@ -342,11 +342,8 @@ alias ll='ls -lah'
 alias osj='openstack -f json'
 alias osc='openstack console log show'
 alias oss='openstack server'
-alias pass='tr -dc A-Za-z0-9_ < /dev/urandom | head -c 20 | xargs'
-alias paste='pastebin -m -n Hactar'
 alias psa='ps auxwwwf'
 alias toph='top -cHd1'
-alias vdir='vdir --color=auto'
 alias ip="ip --color"
 
 alias gw01='z3 gw01.infra.mps.gs.ovh.net'
@@ -368,4 +365,5 @@ alias bat=batcat
 alias osm="openstack --os-cloud management_stack"
 alias osmb="openstack --os-cloud management_stack_sbg"
 alias osmd="openstack --os-cloud management_stack_de"
-export BASTION_CONF_FILE=~/.config/ovh/bastion.env
+export BASTION_CONF_FILE=~/.config/ovh/bastion.env
+VAULT_ADDR="https://vault.ood.ovh:8200"