Merge branch 'master' of https://github.com/danijoo/dotfiles

profiles/base/.tmux.conf

@@ -1,3 +1,8 @@
+set-window-option -g xterm-keys on
+set -s escape-time 10 # faster command timeout
+set -g history-limit 10000 
+
+set -g status-interval 10
 set-option -g mouse on
 
 # make scrolling with wheels work

profiles/base/.zshrc

@@ -24,3 +24,20 @@ eval "$(fasd --init auto)"
 
 # marker
 [[ -s "$HOME/.local/share/marker/marker.sh" ]] && source "$HOME/.local/share/marker/marker.sh"
+
+
+# >>> conda initialize >>>
+# !! Contents within this block are managed by 'conda init' !!
+__conda_setup="$('/home/bauer/conda/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)"
+if [ $? -eq 0 ]; then
+    eval "$__conda_setup"
+else
+    if [ -f "/home/bauer/conda/etc/profile.d/conda.sh" ]; then
+        . "/home/bauer/conda/etc/profile.d/conda.sh"
+    else
+        export PATH="/home/bauer/conda/bin:$PATH"
+    fi
+fi
+unset __conda_setup
+# <<< conda initialize <<<
+