From 855d6ce7028682f0dd9ddd2a7548eb560afb7990 Mon Sep 17 00:00:00 2001
From: Sheldon Lee <sheldon@sheldonlee.com>
Date: Wed, 7 Sep 2022 18:21:39 +0800
Subject: [PATCH 1/3] Added input device options and window rules.

---
 .config/sway/config | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/.config/sway/config b/.config/sway/config
index 7917a27..846b5f8 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -91,6 +91,15 @@ exec swayidle -w \
 #
 	input 1133:50503:Logitech_USB_Receiver accel_profile flat
 	input 1133:16500:Logitech_G304 accel_profile flat
+	input 1133:16521:Logitech_K580 {
+		xkb_layout us
+		xkb_variant colemak
+	}
+	input 1204:4621:Majestouch_Convertible_2 {
+		xkb_layout us
+		xkb_variant colemak
+	}
+
 # You can get the names of your inputs by running: swaymsg -t get_inputs
 # Read `man 5 sway-input` for more information about this section.
 
@@ -305,7 +314,6 @@ bindsym $mod+Control+h gaps horizontal current plus 200
 bindsym $mod+Control+l gaps horizontal current minus 200
 bindsym $mod+shift+f gaps horizontal current toggle 400
 
-gaps inner 5
 smart_gaps inverse_outer
 
 default_border pixel 3
@@ -313,13 +321,14 @@ default_border pixel 3
 #
 # Startup programs:
 #
-#exec wayland-run-on-new-display set-correct-monitor 390+1080
+exec wayland-run-on-new-display set-correct-monitor 390+1080
 exec gentoo-pipewire-launcher
 exec dunst
+exec wlsunset -l 22.4 -L 114.1
 
 exec alacritty
 exec firefox
-exec discord-ff
+exec webcord-bin
 exec signal-desktop
 
 #
@@ -329,11 +338,15 @@ exec signal-desktop
 assign [app_id="firefox"] workspace 2:r
 assign [app_id="Discord Firefox"] workspace 3:s
 for_window [title="^Discord — Mozilla Firefox$"] fullscreen disable
+assign [class="WebCord"] workspace 3:s
 assign [class="Signal"] workspace 3:s
 assign [class="Steam"] workspace 4:t
 # Space Games, as joystick usage without mouse and keyboard count as idle.
 for_window [class="steam_app_359320"] inhibit_idle focus
 for_window [class="starcitizen.exe"] inhibit_idle focus
+# Inhibit idle on focus
+for_window [class="WebCord"] inhibit_idle focus
+for_window [app_id="org.jellyfin.jellyfinmediaplayer"] inhibit_idle focus
 # Floating windows
 for_window [title="^Firefox — Sharing Indicator$"] floating enable, move position 50ppt 0px;
 for_window [class="^Steam$"] floating enable 

From 0b9a54c76316c491435a580be3e4c00492c2b445 Mon Sep 17 00:00:00 2001
From: Sheldon Lee <sheldon@sheldonlee.com>
Date: Sun, 18 Sep 2022 05:48:00 +0800
Subject: [PATCH 2/3] Aesthetic changes and color fixes for newer version of
 bemenu.

---
 .config/scripts/wm/menucmd | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.config/scripts/wm/menucmd b/.config/scripts/wm/menucmd
index 921e899..7984250 100755
--- a/.config/scripts/wm/menucmd
+++ b/.config/scripts/wm/menucmd
@@ -37,14 +37,17 @@ green="#98971a"
 
 bemenu_cmd()
 {
-	bemenu -i -l 10 --scrollbar always\
-	--fn "FiraCode Semibold 11px"\
+	bemenu -i --scrollbar always\
+	-n -p 'Run:' -l 10 -B 3 -W 0.5\
+	--fn "FiraCode Semibold 16px"\
 	--tb $base02 --tf $green\
 	--fb $base03 --ff $base0\
 	--nb $base03 --nf $base0\
+	--ab $base03 --af $base3\
 	--sb $base02 --sf $cyan\
 	--hb $base02 --hf $cyan\
-	--scb $base02 --scf $cyan
+	--scb $base02 --scf $cyan\
+	--bdr $violet
 	$@
 }
 

From 6030888b6c1047c6c8e8db94c76e5e80cc9163e8 Mon Sep 17 00:00:00 2001
From: Sheldon Lee <sheldon@sheldonlee.com>
Date: Sun, 18 Sep 2022 05:48:41 +0800
Subject: [PATCH 3/3] Update window rules and launch wl-sunset.

---
 .config/sway/config | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.config/sway/config b/.config/sway/config
index 4f1c51f..9376d49 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -328,7 +328,7 @@ default_border pixel 3
 exec wayland-run-on-new-display set-correct-monitor 390+1080
 exec gentoo-pipewire-launcher
 exec dunst
-exec wlsunset -l 22.4 -L 114.1
+exec_always pkill wlsunset; wlsunset -l 22.4 -L 114.1
 
 exec alacritty
 exec firefox
@@ -357,6 +357,8 @@ for_window [class="^Steam$"] floating enable
 for_window [class="^Steam$" title="^Steam$"] floating disable
 for_window [class="genshinimact.exe"] floating enable
 for_window [class=".*.exe$"] floating enable
+for_window [class="^QjackCtl$"] floating enable
+for_window [class="^QjackCtl$" title="Graph — QjackCtl"] floating disable
 # Move windows to trash workspace
 for_window [title="^Origin$"] floating enable, move container to workspace trash;
 for_window [title="^Wine System Tray$"] move container to workspace trash;