From 1c0f89eed2f2f0f840eafdd31d48531b2e7bce14 Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Wed, 17 Jan 2018 21:50:59 -0600
Subject: [PATCH] Lots: Prepare for a migration to bspwm I'm gonna do it guys
 For real this time I promise

---
 .config/bspwm/bspwmrc                         | 23 +---------
 .../env/set_window_manager.sh                 |  2 +-
 .config/polybar/config                        | 42 ++++++++++++++++++-
 3 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc
index b7d10137..4d12739c 100755
--- a/.config/bspwm/bspwmrc
+++ b/.config/bspwm/bspwmrc
@@ -24,9 +24,6 @@
 if [[ "$PATH" != "*$HOME/.local/bin" ]]; then
 	export PATH="$HOME/.local/bin:$PATH"
 fi
-if [[ "$PATH" != "*$HOME/.bin" ]]; then
-	export PATH="$HOME/.bin:$PATH"
-fi
 
 ## SIMPLE CONFIGURATION
 xset -b
@@ -35,24 +32,9 @@ xset s off
 
 ## SERVICES AND DAEMONS
 sxhkd &						# Simple hotkey daemon
-xfce4-power-manager &				# Power management daemon
-/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &	# That thing
-dunst &						# Notification daemon
-redshift &					# Eye strain-reducer
-
 feh --randomize --bg-fill ~/Pictures/Wallpapers/i3 &
-compton &					# Desktop compositor
-pulseaudio -D &					# Audio daemon
 polybar alpha & 				# Simple bar
 
-#mopidy &
-#syncthing -no-browser &			# File synchronization daemon
-
-## LOCKUP
-# I autostart my session on all of my machines
-# Thus, having a session-side lock screen is kind of important
-#i3lock -i ~/.i3splash &
-
 ## bspwm GENERAL CONFIGURATION
 bspc monitor -d			I II III IV V VI VII VIII IX X
 
@@ -73,7 +55,6 @@ bspc config normal_border_color			"#1d2021"
 bspc config urgent_border_color			"#fabd2f"
 
 ## bspwm WINDOW RULES
-bspc rule -a Firefox desktop=I
-bspc rule -a Thunderbird desktop=II
-bspc rule -a Spotify desktop=IX
+bspc rule -a Waterfox desktop=I
+bspc rule -a Spotify desktop=X
 
diff --git a/.config/plasma-workspace/env/set_window_manager.sh b/.config/plasma-workspace/env/set_window_manager.sh
index afc4db09..6b687c46 100755
--- a/.config/plasma-workspace/env/set_window_manager.sh
+++ b/.config/plasma-workspace/env/set_window_manager.sh
@@ -1 +1 @@
-export KDEWM=/usr/bin/i3
+export KDEWM=/usr/bin/bspwm
diff --git a/.config/polybar/config b/.config/polybar/config
index d8ef570c..8ea5035c 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -72,7 +72,7 @@ font-4 = ${res/fonts.font-4}
 inherit = template/bar
 tray-position = right
 
-modules-left = i3 cpu memory battery update-arch
+modules-left = i3 bspwm cpu memory battery update-arch
 modules-center = xwindow
 modules-right = xbacklight volume wlan date
 
@@ -92,12 +92,13 @@ content-foreground = ${res/colors.background-4}
 [module/i3]
 type = internal/i3
 format = <label-state><label-mode>
-format-prefix = ""
+format-prefix = 
 format-prefix-padding = 2
 format-prefix-foreground = ${res/colors.background}
 format-prefix-background = ${res/colors.primary}
 enable-scroll = false
 index-sort = true
+pin-workspaces = true
 
 label-mode-padding = 2
 label-mode-foreground = ${res/colors.background}
@@ -120,6 +121,43 @@ label-urgent = ${self.label-focused}
 label-urgent-padding = ${self.label-mode-padding}
 label-urgent-background = ${res/colors.alert}
 
+[module/bspwm]
+type = internal/bspwm
+format = <label-state>
+format-prefix = 
+format-prefix-padding = 2
+format-prefix-foreground = ${res/colors.background}
+format-prefix-background = ${res/colors.primary}
+enable-scroll = false
+pin-workspaces = true
+
+ws-icon-default = 
+
+label-focused = %icon%
+label-focused-padding = 2
+label-focused-foreground = ${res/colors.background}
+label-focused-background = ${res/colors.primary}
+
+label-dimmed = ${self.label-focused}
+label-dimmed-padding = ${self.label-focused-padding}
+label-dimmed-foreground = ${self.label-focused-foreground}
+label-dimmed-background = ${res/colors.background-4}
+
+label-occupied = ${self.label-focused}
+label-occupied-padding = ${self.label-focused-padding}
+label-occupied-foreground = ${res/colors.foreground}
+label-occupied-background = ${res/colors.background}
+
+label-urgent = ${self.label-focused}
+label-urgent-padding = ${self.label-focused-padding}
+label-urgent-foreground = ${res/colors.alert}
+label-urgent-background = ${res/colors.background}
+
+label-empty = ${self.label-focused}
+label-empty-padding = ${self.label-focused-padding}
+label-empty-foreground = ${res/colors.background-4}
+label-empty-background = ${res/colors.background}
+
 [module/battery]
 type = internal/battery
 format-charging = <animation-charging><label-charging>