From acb447dd3a4f9d77d79447e3fc7fe749bd95a54b Mon Sep 17 00:00:00 2001
From: Daniel Bauer <bauer@cbs.tu-darmstadt.de>
Date: Sat, 15 Sep 2018 10:40:08 +0200
Subject: [PATCH 1/5] ssh config

---
 .config/polybar/config |  1 +
 .ssh/config            | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 .ssh/config

diff --git a/.config/polybar/config b/.config/polybar/config
index 7fa015c..8e6292f 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -405,3 +405,4 @@ interval = 1
 tail = false
 format =  <label>
 ; vim:ft=dosini
+
diff --git a/.ssh/config b/.ssh/config
new file mode 100644
index 0000000..ad9b4fe
--- /dev/null
+++ b/.ssh/config
@@ -0,0 +1,25 @@
+Host *
+    ForwardX11 yes
+    PermitLocalCommand yes
+    <!-- LocalCommand tar c -C${HOME} --exclude="dotfiles/.git" --exclude=".zim/.git" dotfiles .zim | ssh -o PermitLocalCommand=no %n "tar mx -C${HOME}; bash ~/dotfiles/dotfiles_setup.sh  ; chsh -s /bin/zsh" -->
+
+Host summonerapi
+	HostName 46.4.78.43
+
+Host biodata0
+	User bauer
+    HostName biodata0.compbiol.bio.tu-darmstadt.de
+
+Host bioclust
+	User bauer
+	HostName bioclust.bio.tu-darmstadt.de
+
+Host bioinfo4
+    HostName 10.0.0.4
+	User bauer
+    ProxyCommand ssh -q biodata0 nc -q0 %h 22
+
+Host lcluster?*
+  User yg38ymab
+  ForwardX11 yes
+  HostName %h.hrz.tu-darmstadt.de

From 753bcb856fe4429920c9d1053568464c41ac5a6c Mon Sep 17 00:00:00 2001
From: Daniel Bauer <bauer@cbs.tu-darmstadt.de>
Date: Sat, 15 Sep 2018 10:50:41 +0200
Subject: [PATCH 2/5] laptop battery

---
 .config/polybar/config | 60 +++++++++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 27 deletions(-)

diff --git a/.config/polybar/config b/.config/polybar/config
index 8e6292f..6965b1d 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -71,7 +71,7 @@ inherit = bar/example
 modules-left = i3
 tray-position = right
 tray-padding = 2
-modules-right = spotify volume filesystemroot memory cpu battery battery2 date
+modules-right = spotify volume filesystemroot memory cpu battery1 battery2 date
 modules-center = xwindow
 
 [module/xwindow]
@@ -306,32 +306,6 @@ bar-volume-empty = -
 bar-volume-empty-font = 2
 bar-volume-empty-foreground = ${colors.foreground-alt}
 
-[module/battery]
-type = internal/battery
-battery = BAT0
-adapter = ADP1
-full-at = 98
-
-format-charging = <animation-charging> <label-charging>
-format-charging-underline = #ffb52a
-
-format-discharging = <ramp-capacity> <label-discharging>
-format-discharging-underline = ${self.format-charging-underline}
-
-format-full-prefix = " "
-format-full-prefix-foreground = ${colors.foreground-alt}
-format-full-underline = ${self.format-charging-underline}
-
-ramp-capacity-0 = 
-ramp-capacity-1 = 
-ramp-capacity-2 = 
-ramp-capacity-foreground = ${colors.foreground-alt}
-
-animation-charging-0 = 
-animation-charging-1 = 
-animation-charging-2 = 
-animation-charging-foreground = ${colors.foreground-alt}
-animation-charging-framerate = 750
 
 [module/temperature]
 type = internal/temperature
@@ -406,3 +380,35 @@ tail = false
 format =  <label>
 ; vim:ft=dosini
 
+[module/battery1]
+type = internal/battery
+battery = BAT0
+adapter = ADP1
+full-at = 98
+
+format-charging = <animation-charging> <label-charging>
+format-charging-underline = #ffb52a
+
+format-discharging = <ramp-capacity> <label-discharging>
+format-discharging-underline = ${self.format-charging-underline}
+
+format-full-prefix = " "
+format-full-prefix-foreground = ${colors.foreground-alt}
+format-full-underline = ${self.format-charging-underline}
+
+ramp-capacity-0 = 
+ramp-capacity-1 = 
+ramp-capacity-2 = 
+ramp-capacity-3 = 
+ramp-capacity-4 = 
+<!-- ramp-capacity-foreground = ${colors.foreground-alt} -->
+
+animation-charging-0 = 
+animation-charging-1 = 
+animation-charging-2 = 
+animation-charging-foreground = ${colors.foreground-alt}
+animation-charging-framerate = 750
+
+[module/battery2]
+inherit = module/battery1
+battery = BAT1
\ No newline at end of file

From ee5f36c99197d3592088ef9a6755e59a635293a4 Mon Sep 17 00:00:00 2001
From: Daniel Bauer <bauer@cbs.tu-darmstadt.de>
Date: Sat, 15 Sep 2018 10:52:04 +0200
Subject: [PATCH 3/5] fix ssh

---
 .ssh/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ssh/config b/.ssh/config
index ad9b4fe..8ba3dad 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -1,7 +1,7 @@
 Host *
     ForwardX11 yes
     PermitLocalCommand yes
-    <!-- LocalCommand tar c -C${HOME} --exclude="dotfiles/.git" --exclude=".zim/.git" dotfiles .zim | ssh -o PermitLocalCommand=no %n "tar mx -C${HOME}; bash ~/dotfiles/dotfiles_setup.sh  ; chsh -s /bin/zsh" -->
+    #LocalCommand tar c -C${HOME} --exclude="dotfiles/.git" --exclude=".zim/.git" dotfiles .zim | ssh -o PermitLocalCommand=no %n "tar mx -C${HOME}; bash ~/dotfiles/dotfiles_setup.sh  ; chsh -s /bin/zsh" 
 
 Host summonerapi
 	HostName 46.4.78.43

From 1388a63f8898489a1be70440cfde4692cc837020 Mon Sep 17 00:00:00 2001
From: Daniel Bauer <bauer@cbs.tu-darmstadt.de>
Date: Sun, 16 Sep 2018 21:12:54 +0200
Subject: [PATCH 4/5] fix workspace 5 not shown

---
 .config/i3/config | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.config/i3/config b/.config/i3/config
index ce2a2a3..0641033 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -99,11 +99,12 @@ bindsym $mod+a focus parent
 # focus the child container
 #bindsym $mod+d focus child
 
+set $workspace0 0
 set $workspace1 1
 set $workspace2 2
 set $workspace3 3
 set $workspace4 4
-set $workspace5 5 
+set $workspace5 5
 set $workspace6 6
 set $workspace7 7
  #
@@ -113,6 +114,7 @@ set $workspace9 9
 #
 
 # switch to workspace
+bindsym $mod+0 workspace $workspace0
 bindsym $mod+1 workspace $workspace1
 bindsym $mod+2 workspace $workspace2
 bindsym $mod+3 workspace $workspace3
@@ -124,6 +126,7 @@ bindsym $mod+8 workspace $workspace8
 bindsym $mod+9 workspace $workspace9
 
 # move focused container to workspace
+bindsym $mod+Shift+0 move container to workspace $workspace0
 bindsym $mod+Shift+1 move container to workspace $workspace1
 bindsym $mod+Shift+2 move container to workspace $workspace2
 bindsym $mod+Shift+3 move container to workspace $workspace3
@@ -180,12 +183,10 @@ new_window 1pixel
 
 exec_always --no-startup-id ~/.config/polybar/polybar.sh
 
-workspace $workspace1 output HDMI-0
 workspace $workspace7 output DP-0 
 workspace $workspace8 output DP-0 
 workspace $workspace9 output DP-0 
 
-
 for_window [window_role="pop-up"] floating enable
 for_window [class="Tk"] floating enable
 for_window [title="PyMOL Viewer"] floating enable

From a5d11bd68906d096612102115b0d12862c04572d Mon Sep 17 00:00:00 2001
From: Daniel Bauer <bauer@cbs.tu-darmstadt.de>
Date: Sun, 16 Sep 2018 21:13:06 +0200
Subject: [PATCH 5/5] add rust to path

---
 .zshrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.zshrc b/.zshrc
index f034cf7..b578f9c 100644
--- a/.zshrc
+++ b/.zshrc
@@ -28,6 +28,7 @@ source $HOME/.zshrc_local
 fi
 
 # alter path
+export PATH="$HOME/.cargo/bin:$PATH"
 export PATH="/opt/pymol:${PATH}"
 export PATH="$HOME/anaconda3/bin:${PATH}" # binaries
 export PATH="$HOME/bin:${PATH}" # binaries