From f4ae31b8fce25251d74b2006a2f4bf6c0212e39c Mon Sep 17 00:00:00 2001
From: Ryan <ryan@andthensome.nl>
Date: Wed, 23 Nov 2016 10:31:43 +0100
Subject: [PATCH] Added email workspace and cmus

---
 i3/.config/i3/config        | 29 +++++++++++++++++------------
 i3/.config/i3/i3blocks      |  2 +-
 i3/.config/i3/i3blocks.conf | 11 ++++++++---
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index 1808be8..481e5dd 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -118,7 +118,8 @@ set $workspace2 "2: www "
 set $workspace3 "3: code "
 set $workspace4 "4: music "
 set $workspace5 "5: news "
-set $workspace6 "6: im "
+set $workspace6 "6: email "
+set $workspace7 "7: im "
 
 # switch to workspace
 bindsym $mod+1 workspace $workspace1
@@ -127,7 +128,7 @@ bindsym $mod+3 workspace $workspace3
 bindsym $mod+4 workspace $workspace4
 bindsym $mod+5 workspace $workspace5
 bindsym $mod+6 workspace $workspace6
-bindsym $mod+7 workspace 7
+bindsym $mod+7 workspace $workspace7
 bindsym $mod+8 workspace 8
 bindsym $mod+9 workspace 9
 bindsym $mod+0 workspace 10
@@ -139,27 +140,30 @@ bindsym $mod+Shift+3 move container to workspace $workspace3
 bindsym $mod+Shift+4 move container to workspace $workspace4
 bindsym $mod+Shift+5 move container to workspace $workspace5
 bindsym $mod+Shift+6 move container to workspace $workspace6
-bindsym $mod+Shift+7 move container to workspace 7
-bindsym $mod+Shift+8 move container to workspace 8 
-bindsym $mod+Shift+9 move container to workspace 9 
-bindsym $mod+Shift+0 move container to workspace 10 
+bindsym $mod+Shift+7 move container to workspace $workspace7
+bindsym $mod+Shift+8 move container to workspace 8
+bindsym $mod+Shift+9 move container to workspace 9
+bindsym $mod+Shift+0 move container to workspace 10
 
 workspace $workspace1 output DP1 
 workspace $workspace2 output DP1
 workspace $workspace3 output DP1
 workspace $workspace4 output DP1
 workspace $workspace5 output DP1
-workspace $workspace6 output HDMI1
+workspace $workspace6 output DP1
+workspace $workspace7 output HDMI1
 
 assign [class="Google-chrome" instance="reddit.com"] $workspace5
 assign [class="Google-chrome" instance="tweetdeck.twitter.com"] $workspace5
 assign [class="Google-chrome"] $workspace2
 assign [class="Firefox"] $workspace2
 assign [class="Clementine"] $workspace4
+assign [class="Terminator" instance="cmus"] $workspace4
 assign [class="Gpodder"] $workspace4
-assign [class="Hexchat"] $workspace6
-assign [class="Slack"] $workspace6
-assign [class="MPlayer" instance="aljazeera"] $workspace6
+assign [class="Terminator" instance="mutt"] $workspace6
+assign [class="Hexchat"] $workspace7
+assign [class="Slack"] $workspace7
+assign [class="MPlayer" instance="aljazeera"] $workspace7
 
 # reload the configuration file
 bindsym $mod+Shift+c reload
@@ -199,7 +203,7 @@ for_window [title="Screen Layout Editor"] floating enable
 for_window [title="Write:"] floating enable
 
 # Toggl
-for_window [title="Toggl Desktop"] floating enable
+#for_window [title="Toggl Desktop"] floating enable
 
 # Widow Colours
 #                         border  background text    indicator
@@ -255,7 +259,8 @@ exec firefox
 exec hexchat
 exec slack
 exec ~/.config/i3/aljazeera.sh
-exec clementine
+exec terminator --classname=cmus -e cmus
+exec terminator --classname=mutt -e mutt
 exec gpodder
 
 # Custom KeyBinds
diff --git a/i3/.config/i3/i3blocks b/i3/.config/i3/i3blocks
index 9974846..36680fd 160000
--- a/i3/.config/i3/i3blocks
+++ b/i3/.config/i3/i3blocks
@@ -1 +1 @@
-Subproject commit 9974846fe51a208ca14ea04af13ad89e8467e198
+Subproject commit 36680fd035d742e1db88d763bc5c40b2291c335a
diff --git a/i3/.config/i3/i3blocks.conf b/i3/.config/i3/i3blocks.conf
index 6eedb6f..e57ec48 100644
--- a/i3/.config/i3/i3blocks.conf
+++ b/i3/.config/i3/i3blocks.conf
@@ -50,12 +50,17 @@ interval=60
 color=#00FF00
 
 # Music
-[playerctl]
-command=~/.config/i3/vendor/i3blocks/blocks/playerctl
+[cmus]
+command=~/.config/i3/i3blocks/cmus
 label=
-instance=clementine
 interval=5
 
+#[playerctl]
+#command=~/.config/i3/vendor/i3blocks/blocks/playerctl
+#label=
+#instance=clementine
+#interval=5
+
 # Docker
 [containers]
 label=