From 28817a4542c1a9edb4d85a21bc8edce9872b663a Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Thu, 27 Sep 2018 20:45:47 -0500
Subject: [PATCH] bspwm, dtfscript: Move configuration to dtfscript, turn
 existing config into fallback

---
 .config/bspwm/bspwmrc             |  7 ++--
 .config/dtfscripts/tasks/bspwm.sh | 60 +++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 3 deletions(-)
 create mode 100755 .config/dtfscripts/tasks/bspwm.sh

diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc
index c13daa46..48a8bea6 100755
--- a/.config/bspwm/bspwmrc
+++ b/.config/bspwm/bspwmrc
@@ -24,6 +24,7 @@
 dtfscript=$HOME/.config/dtfscripts/dtfscript
 if [[ -x "$dtfscript" ]]; then
 	source "$dtfscript"
+	exit 0
 fi
 unset dtfscript
 
@@ -43,8 +44,8 @@ bspc config pointer_action2		resize_corner #RMB
 
 ## Looks
 # Padding
-bspc config border_width		${BSPWM_BORDER_WIDTH:-2}
-bspc config window_gap			${BSPWM_WINDOW_GAP:-8}
+bspc config border_width		2
+bspc config window_gap			0
 bspc config single_monocle		false
 bspc config borderless_monocle		false
 bspc config gapless_monocle		true
@@ -54,7 +55,7 @@ bspc config active_border_color			"#458588" #Focused, but current monitor isn't
 bspc config focused_border_color		"#83a598" #Focused completely
 bspc config presel_feedback_color		"#9b9b9b" #???
 
-printf "bspwm: Setting window rules\n"
+## Rules
 bspc rule -r '*'
 bspc rule -a Firefox desktop=1
 bspc rule -a Firefox-esr desktop=1
diff --git a/.config/dtfscripts/tasks/bspwm.sh b/.config/dtfscripts/tasks/bspwm.sh
new file mode 100755
index 00000000..7f85dfa9
--- /dev/null
+++ b/.config/dtfscripts/tasks/bspwm.sh
@@ -0,0 +1,60 @@
+#! /bin/bash
+#
+# bspwm.sh
+# Copyright (C) 2018 salt <salt@lap-th-e560-0>
+#
+# Distributed under terms of the MIT license.
+#
+
+if ! pgrep bspwm > /dev/null 2>&1; then
+	tsk_log "Not under bspwm" 1
+	exit 1
+fi
+
+tsk_log "Configuring bspwm miscellanea"
+## Behavior
+tsk_log "Configuring behavior" 0
+# Tiling behavior
+bspc config split_ratio			0.50
+bspc config remove_disabled_monitors	false
+bspc config remove_unplugged_monitors	true
+
+# Pointer behavior
+bspc config click_to_focus		any
+bspc config pointer_follows_focus	false
+bspc config pointer_follows_monitor	true
+bspc config pointer_modifier		mod1
+bspc config pointer_action1		move #LMB
+bspc config pointer_action2		resize_corner #RMB
+
+## Looks
+tsk_log "Configuring looks" 0
+# Padding
+bspc config border_width		${BSPWM_BORDER_WIDTH:-2}
+bspc config window_gap			${BSPWM_WINDOW_GAP:-8}
+bspc config single_monocle		false
+bspc config borderless_monocle		false
+bspc config gapless_monocle		true
+# Colors
+bspc config normal_border_color			"#3c3836" #Unfocused
+bspc config active_border_color			"#458588" #Focused, but current monitor isn't
+bspc config focused_border_color		"#83a598" #Focused completely
+bspc config presel_feedback_color		"#9b9b9b" #???
+
+tsk_log "Setting window rules" 0
+bspc rule -r '*'
+bspc rule -a Firefox desktop=1
+bspc rule -a Firefox-esr desktop=1
+bspc rule -a Waterfox desktop=1
+bspc rule -a discord desktop=7
+bspc rule -a spotify desktop=8
+bspc rule -a 'Minecraft 1.7.10' state=fullscreen
+# For fullscreen Wine
+bspc rule -a explorer.exe state=fullscreen
+# Plasma rules
+bspc rule -a plasmashell state=floating sticky=on border=off
+bspc rule -a krunner state=floating layer=above sticky=on border=off
+# Widgets
+bspc rule -a Conky state=floating layer=below sticky=on
+bspc rule -a pavucontrol-qt state=floating layer=above sticky=on
+