From acde8559eb39842bfca58dcb4f43ff7613356c0f Mon Sep 17 00:00:00 2001
From: Jesper Fussing Moerk <jfm@moerks.dk>
Date: Fri, 9 Feb 2018 15:08:35 +0100
Subject: [PATCH] Refactored a few locations

---
 i3/.config/i3/config                   | 14 +++-----------
 i3/.config/i3/scripts/home-layout.sh   |  4 ++--
 i3/.config/i3/scripts/laptop-layout.sh |  4 ++--
 i3/.config/i3/scripts/work-layout.sh   |  1 -
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index eb95e72..f06a6e1 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -135,14 +135,6 @@ new_window 1pixel
 gaps inner 10
 gaps outer 5
 
-#Gnome Sessions
-#exec --no-startup-id gnome-session
-#exec --no-startup-id /usr/libexec/gsd-sound
-
-#Applets
-#exec --no-startup-id nm-applet
-#exec --no-startup-id pasystray
-
 ###Displaymode
 set $displayMode "Set display mode [w]ork [l]aptop [h]ome"
 mode $displayMode {
@@ -182,8 +174,8 @@ bindsym $mod+Delete mode "$mode_system"
 bindsym $mod+d exec --no-startup-id rofi -show drun -config ~/.config/i3/rofi/config
 
 #Bars
-exec --no-startup-id ~/.config/i3/polybar/polybar.sh
-exec --no-startup-id ~/.config/i3/scripts/applets.sh
+exec --no-startup-id ~/.config/polybar/polybar.sh
 
-#Music
+# System Scripts
+exec --no-startup-id ~/.config/i3/scripts/applets.sh
 exec --no-startup-id ~/.config/i3/scripts/music.sh
diff --git a/i3/.config/i3/scripts/home-layout.sh b/i3/.config/i3/scripts/home-layout.sh
index c10e567..7c970df 100755
--- a/i3/.config/i3/scripts/home-layout.sh
+++ b/i3/.config/i3/scripts/home-layout.sh
@@ -25,8 +25,8 @@ i3-msg 'workspace "5: Media"; append_layout ~/.config/i3/layouts/home-workspace5
 #TODO: Set and execute something for the first terminal
 i3-msg 'workspace "5: Media"; exec gnome-terminal --title="TODO"'
 i3-msg 'workspace "5: Media"; exec gnome-terminal --title="newsbeuter" -e newsbeuter'
-i3-msg 'workspace "5: Media"; exec gnome-terminal --title="music" -e ~/Templates/music.sh'
+i3-msg 'workspace "5: Media"; exec gnome-terminal --title="music" -e ncmpc'
 i3-msg 'workspace "5: Media"; move workspace to output DP-2-2'
 
 feh --bg-scale --zoom fill ~/.config/i3/wallpaper/frozen_leafs.jpg
-~/.config/i3/polybar/home-polybar.sh
\ No newline at end of file
+~/.config/polybar/home-polybar.sh
\ No newline at end of file
diff --git a/i3/.config/i3/scripts/laptop-layout.sh b/i3/.config/i3/scripts/laptop-layout.sh
index 4038ae6..72f2ec8 100755
--- a/i3/.config/i3/scripts/laptop-layout.sh
+++ b/i3/.config/i3/scripts/laptop-layout.sh
@@ -21,8 +21,8 @@ i3-msg 'workspace "5: Media"; append_layout ~/.config/i3/layouts/laptop-workspac
 #TODO: Set and execute something for the first terminal
 i3-msg 'workspace "5: Media"; exec gnome-terminal --title="TODO" --profile laptop'
 i3-msg 'workspace "5: Media"; exec gnome-terminal --title="newsbeuter" --profile laptop -e newsbeuter'
-i3-msg 'workspace "5: Media"; exec gnome-terminal --title="music" --profile laptop -e ~/Templates/music.sh'
+i3-msg 'workspace "5: Media"; exec gnome-terminal --title="music" --profile laptop -e ncmpc'
 i3-msg 'workspace "5: Media"; move workspace to output eDP-1'
 
 feh --bg-scale --zoom fill ~/.config/i3/wallpaper/frozen_leafs.jpg
-~/.config/i3/polybar/laptop-polybar.sh
+~/.config/polybar/laptop-polybar.sh
diff --git a/i3/.config/i3/scripts/work-layout.sh b/i3/.config/i3/scripts/work-layout.sh
index 6b330d6..8af9d64 100755
--- a/i3/.config/i3/scripts/work-layout.sh
+++ b/i3/.config/i3/scripts/work-layout.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 i3-msg 'workspace "1: Comms"; append_layout ~/.config/i3/layouts/work-workspace1-comms.json'
 i3-msg 'workspace "1: Comms"; exec gnome-terminal --title="weechat" -e weechat'
-#i3-msg 'workspace "1: Comms"; exec /home/jfm/Tools/mattermost-desktop-3.7.1/mattermost-desktop'
 i3-msg 'workspace "1: Comms"; move workspace to output DP-2-1'
 sleep 2