From 6cfcbf321de6d00eeef24781e88d2873bca4011a Mon Sep 17 00:00:00 2001
From: Daniel Bauer <bauer@cbs.tu-darmstadt.de>
Date: Wed, 30 Oct 2019 09:47:03 +0100
Subject: [PATCH 1/5] conda in zshrc

---
 profiles/base/.zshrc | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/profiles/base/.zshrc b/profiles/base/.zshrc
index 0d1221c..a47fb95 100644
--- a/profiles/base/.zshrc
+++ b/profiles/base/.zshrc
@@ -26,3 +26,19 @@ 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 <<<
+

From 6aa61f45eb85d7c9ea772934b4c9c0efc5f74584 Mon Sep 17 00:00:00 2001
From: Daniel Bauer <bauer@cbs.tu-darmstadt.de>
Date: Wed, 30 Oct 2019 09:47:38 +0100
Subject: [PATCH 2/5] tmux config

---
 profiles/base/.tmux.conf | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 profiles/base/.tmux.conf

diff --git a/profiles/base/.tmux.conf b/profiles/base/.tmux.conf
new file mode 100644
index 0000000..d993e80
--- /dev/null
+++ b/profiles/base/.tmux.conf
@@ -0,0 +1,5 @@
+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

From 1f6c58e03179884abe11b26270ac892f9006b19d Mon Sep 17 00:00:00 2001
From: Daniel Bauer <bauer@cbs.tu-darmstadt.de>
Date: Wed, 30 Oct 2019 09:48:19 +0100
Subject: [PATCH 3/5] sublime test: rust

---
 .../sublime-text-3/Packages/User/Preferences.sublime-settings  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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"

From af92741e13911a8149a3373e488ff33267e0e2ee Mon Sep 17 00:00:00 2001
From: Daniel Bauer <bauer@cbs.tu-darmstadt.de>
Date: Wed, 30 Oct 2019 09:48:38 +0100
Subject: [PATCH 4/5] new proxy commands


From 8f2656357f9a6b11881f68858c890f8623b2744c Mon Sep 17 00:00:00 2001
From: Daniel Bauer <bauer@cbs.tu-darmstadt.de>
Date: Wed, 30 Oct 2019 09:51:01 +0100
Subject: [PATCH 5/5] fix tmux

---
 profiles/base/.tmux.conf | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/profiles/base/.tmux.conf b/profiles/base/.tmux.conf
index 31c09bc..69149a2 100644
--- a/profiles/base/.tmux.conf
+++ b/profiles/base/.tmux.conf
@@ -1,13 +1,10 @@
-<<<<<<< HEAD
 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
 bind -n WheelUpPane if-shell -F -t = "#{mouse_any_flag}" "send-keys -M" "if -Ft= '#{pane_in_mode}' 'send-keys -M' 'select-pane -t=; copy-mode -e; send-keys -M'"
 bind -n WheelDownPane select-pane -t= \; send-keys -M
->>>>>>> 1f76fd836f0ef1b53fc69ba45322da6824c50465