From c88e7a367f49f46ee59df394e5aa9e7147f97bfc Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Fri, 7 Jun 2019 02:10:09 -0500
Subject: [PATCH] DSK, i3: Slight polish, disable Conky wttr

---
 .config/dsk/dskrc          | 4 ++--
 .config/dsk/run/conky-wttr | 0
 .config/i3/config          | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)
 mode change 100755 => 100644 .config/dsk/run/conky-wttr

diff --git a/.config/dsk/dskrc b/.config/dsk/dskrc
index 842d0321..3dab6429 100755
--- a/.config/dsk/dskrc
+++ b/.config/dsk/dskrc
@@ -43,10 +43,10 @@ esac
 # Background setting
 if [ -f "~/.fehbg" ] && command -v feh; then
 	~/.fehbg &
-elif command -v hsetroot > /dev/null 2>&1; then
-	hsetroot -solid "#383c4a" -tile "$HOME/.wptile" -center "$HOME/.wpcenter" &
 elif command -v nitrogen > /dev/null 2>&1; then
 	nitrogen --restore &
+elif command -v hsetroot > /dev/null 2>&1; then
+	hsetroot -solid "#383c4a" -tile "$HOME/.wptile" -center "$HOME/.wpcenter" &
 fi
 
 if [ -z "$DSK_FLAG_HASRESTARTED" ]; then
diff --git a/.config/dsk/run/conky-wttr b/.config/dsk/run/conky-wttr
old mode 100755
new mode 100644
diff --git a/.config/i3/config b/.config/i3/config
index f6ea775d..f9a49b10 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -51,17 +51,21 @@ new_window pixel 2
 for_window [class=".*"] border pixel 2
 for_window [class=".*"] title_format "%title"
 
-# Miscellaneous window rules
+# WS1 - Web browsing
 for_window [class="Firefox"] move to workspace $w1
 for_window [class="Firefox-esr"] move to workspace $w1
 for_window [class="Waterfox" ] move to workspace $w1
+# WS2 - Games/misc
 for_window [class="Steam" ] move to workspace $w2
+# WS7 - Feeds
 for_window [class="Liferea" ] move to workspace $w7
 for_window [class="Thunderbird" ] move to workspace $w7
+# WS8 - Recreation/chats
 for_window [class="discord"] move to workspace $w8
 for_window [class="Spotify"] move to workspace $w8
 for_window [class="Audacious"] move to workspace $w8
 
+# Miscellaneous window rules
 for_window [title="Minecraft 1.7.10"] fullscreen enable
 for_window [title="Minecraft 1.12.2"] fullscreen enable
 for_window [title="hl2_linux" ] fullscreen enable
@@ -69,7 +73,6 @@ for_window [class="explorer.exe"] fullscreen enable
 for_window [class="plasmashell"] kill, floating enable, border none
 for_window [class="pavucontrol-qt"] floating enable, sticky enable
 for_window [class="Pavucontrol"] floating enable, sticky enable
-
 no_focus [class="Conky"]
 no_focus [class="plasmashell"]