Merge branch 'master' of https://git.asgard.bitvalve.org/mschoengens/dotconfigs

tmux/tmux.conf

@@ -1,5 +1,6 @@
 set-option -g prefix C-t
 set-option -g allow-rename off
+set-option -g escape-time 0
 set-window-option -g allow-rename off 
 bind-key h swap-window -t -1
 bind-key l swap-window -t +1

zsh/zshrc

@@ -189,9 +189,12 @@ compdef st=ssh
 
 ### Alias configuration
 
+alias dc='docker-compose --env-file docker-compose.env'
+
 if [[ $(uname) = "Linux" ]]; then
     alias em='emacs -nw'
     alias ec='emacsclient -c'
+    alias gl='glances -b'
     alias grep='grep --color'
     alias ls='ls --color'
     alias l='ls -lh --color'