diff --git a/profiles/base/.tmux.conf b/profiles/base/.tmux.conf index eaa3654..69149a2 100644 --- a/profiles/base/.tmux.conf +++ b/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 diff --git a/profiles/base/.zshrc b/profiles/base/.zshrc index 1361c69..b0414e2 100644 --- a/profiles/base/.zshrc +++ b/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 <<< + diff --git a/profiles/desktop/.config/sublime-text-3/Packages/User/Preferences.sublime-settings b/profiles/desktop/.config/sublime-text-3/Packages/User/Preferences.sublime-settings index fa0af08..f562f94 100644 --- a/profiles/desktop/.config/sublime-text-3/Packages/User/Preferences.sublime-settings +++ b/profiles/desktop/.config/sublime-text-3/Packages/User/Preferences.sublime-settings @@ -1,11 +1,12 @@ { "color_scheme": "Packages/gruvbox/gruvbox (Dark) (Medium).sublime-color-scheme", "font_face": "Hack for Powerline Regular", - "font_size": 14, + "font_size": 13, "hot_exit": false, "ignored_packages": [ "RestructuredText", + "Rust", "Six", "Vintage", "Vintageous"