From 664cacf190b6348ca83700084d5f74aba2b0b24f Mon Sep 17 00:00:00 2001
From: ksyasuda <ksyasuda@umich.edu>
Date: Mon, 6 Dec 2021 15:40:50 -0800
Subject: [PATCH] update laptop config with bspwm

---
 polybar-themes/sblocks/config-4k.ini | 12 ++++++++----
 polybar-themes/sblocks/modules.ini   | 12 ++++++------
 polybar/config.ini                   |  7 +++++--
 scripts/launch.sh                    |  4 ++--
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/polybar-themes/sblocks/config-4k.ini b/polybar-themes/sblocks/config-4k.ini
index 4075a33..9828bbd 100644
--- a/polybar-themes/sblocks/config-4k.ini
+++ b/polybar-themes/sblocks/config-4k.ini
@@ -137,6 +137,7 @@ module-margin-right = 0
 font-0 = "DroidSansMono Nerd Font:size=9;3"
 font-1 = "icomoon-feather:size=9;3"
 font-2 = "Weather Icons:size=9;3"
+font-3 = "Source Han Sans JP:size=8;3"
 
 ; Modules are added to one of the available blocks
 ;   modules-left = cpu ram
@@ -144,7 +145,7 @@ font-2 = "Weather Icons:size=9;3"
 ;   modules-right = ipc clock
 
 ; modules-left = sep menu sep workspaces sep cust-mpd-prev custom-mpd cust-mpd-next
-modules-left = sep launcher sep i3-workspaces sep chrome flameshot color-picker sep cust-mpd-icon cust-mpd-prev custom-mpd cust-mpd-next
+modules-left = sep launcher sep bspwm-workspaces chrome flameshot color-picker sep cust-mpd-icon cust-mpd-prev custom-mpd cust-mpd-next
 modules-center =  title-icon title package-updates-trigger package-updates
 ; modules-right = color-switch sep alsa sep battery sep network sep date sep sysmenu sep
 modules-right = sep bluetooth-4k sep pulseaudio sep battery sep network sep date weather sep sysmenu sep
@@ -161,7 +162,9 @@ dim-value = 1.0
 ; If the value is empty or undefined, the atom value
 ; will be created from the following template: polybar-[BAR]_[MONITOR]
 ; NOTE: The placeholders are not available for custom values
-wm-name = i3
+; wm-name = i3
+wm-name = bspwm
+
 
 ; Locale used to localize various module data (e.g. date)
 ; Expects a valid libc locale, for example: sv_SE.UTF-8
@@ -210,11 +213,12 @@ tray-scale = 1.0
 ; Currently supported WM's:
 ;   bspwm
 ;   i3 (requires: `override-redirect = true`)
-wm-restack = i3
+; wm-restack = i3
+wm-restack = bspwm
 
 ; Set a DPI values used when rendering text
 ; This only affects scalable fonts
-dpi = 188
+dpi = 192
 
 ; Enable support for inter-process messaging
 ; See the Messaging wiki page for more details.
diff --git a/polybar-themes/sblocks/modules.ini b/polybar-themes/sblocks/modules.ini
index 0abe004..b34d0f5 100644
--- a/polybar-themes/sblocks/modules.ini
+++ b/polybar-themes/sblocks/modules.ini
@@ -854,7 +854,7 @@ interface = eth0
 
 [module/wireless-network]
 type = internal/network
-interface = wlp2s0
+interface = wlan0
 
 
 [module/network-wlan]
@@ -968,7 +968,7 @@ ramp-signal-padding = 1
 ; Normal Module
 [module/network]
 type = internal/network
-interface = wlp2s0
+interface = wlan0
 
 ; Seconds to sleep between updates
 ; Default: 1
@@ -1412,7 +1412,7 @@ label-monitor = %name%
 ;   %icon%
 ;   %index%
 ; Default: %icon%  %name%
-label-active = %icon%
+label-active = %name%
 label-active-foreground = ${color.foreground}
 label-active-background = ${color.primary}
 
@@ -1422,7 +1422,7 @@ label-active-background = ${color.primary}
 ;   %icon%
 ;   %index%
 ; Default: %icon%  %name%
-label-occupied = %icon%
+label-occupied = %name%
 label-occupied-foreground = ${color.foreground}
 label-occupied-background = ${color.black}
 
@@ -1431,7 +1431,7 @@ label-occupied-background = ${color.black}
 ;   %icon%
 ;   %index%
 ; Default: %icon%  %name%
-label-urgent = %icon%
+label-urgent = %name%
 label-urgent-foreground = ${color.red}
 label-urgent-background = ${color.red}
 
@@ -1440,7 +1440,7 @@ label-urgent-background = ${color.red}
 ;   %icon%
 ;   %index%
 ; Default: %icon%  %name%
-label-empty = %icon%
+label-empty = %name%
 label-empty-foreground = ${color.foreground}
 label-empty-background = ${color.background-alt}
 
diff --git a/polybar/config.ini b/polybar/config.ini
index 2e95f05..6ee8ea4 100644
--- a/polybar/config.ini
+++ b/polybar/config.ini
@@ -57,7 +57,10 @@ fixed-center = true
 line-size = 2
 radius = 0
 override-redirect = true
-wm-restack = i3
+; override-redirect = false
+; wm-restack = i3
+wm-restack = bspwm
+override-redirect = true
 
 #background = ${color.bg}
 ; background = #282c34
@@ -73,7 +76,7 @@ font-2 = Weather Icons:size=20;1
 font-3 = "Source Han Sans JP:pixelsize=20;antialias=true;3"
 font-4 = "PowerlineSymbols:pixelsize=20;antialias=true;3"
 
-dpi = 90
+dpi = 100
 
 ;==========================================================
 
diff --git a/scripts/launch.sh b/scripts/launch.sh
index 189e823..37f04a9 100755
--- a/scripts/launch.sh
+++ b/scripts/launch.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 ## Add this to your wm startup file.
 
@@ -6,7 +6,7 @@
 killall -q polybar
 
 # Wait until the processes have been shut down
-while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done
+while pgrep -u "$UID" -x polybar >/dev/null; do sleep 1; done
 
 # polybar -c ~/i3/configs/config.ini main &
 # polybar -c ~/SudacodeRice/polybar/config.ini main &