5 files changed, 53 insertions, 56 deletions
diff --git a/.config/sway/auto.conf b/.config/sway/auto.conf
index fe004f9..ae56c9c 100644
--- a/.config/sway/auto.conf
+++ b/.config/sway/auto.conf
@@ -13,22 +13,24 @@ for_window [class="zoom" title="Zoom - Converting.*"] floating enable
 for_window [title="tridactyledit"] floating enable
 for_window [app_id="launcher"] floating enable
 for_window [class="balena-etcher-electron"] floating enable; border normal
-for_window [app_id="firefox" title="Picture-in-Picture"] floating enable, sticky enable, border none
-for_window [app_id="firefox" title="^Developer Tools"] floating enable
-for_window [app_id="firefox" title="Sharing Indicator$"] floating enable, border none, move position 0 ppt 50 ppt, sticky enable
-for_window [app_id="firefox" title="^Close tabs?"] floating enable
-for_window [app_id="firefox" title="^File Upload$"] exec centercon -w .6
-for_window [app_id="firefox" title="^Save As$"] exec centercon -w .6
+
+for_window [app_id="firefox.*" title="Picture-in-Picture"] floating enable, sticky enable, border none
+for_window [app_id="firefox.*" title="^Developer Tools"] floating enable
+for_window [app_id="firefox.*" title="Sharing Indicator$"] floating enable, border none, move position 0 ppt 50 ppt, sticky enable
+for_window [app_id="firefox.*" title="^Close tabs?"] floating enable
+for_window [app_id="firefox.*" title="^File Upload$"] exec centercon -w .6
+for_window [app_id="firefox.*" title="^Save As$"] exec centercon -w .6
 for_window [app_id="Telegram" title="^Choose Files$"] floating enable; exec centercon -w .6
+for_window [app_id="obs" title="^Local File$"] floating enable; exec centercon -w .6
 
 # Tag windows
-for_window [app_id="firefox"] mark browser
+for_window [app_id="firefox.*"] mark browser
 for_window [class="Nightly"] mark browser
 for_window [class="Chromium-browser"] mark work; mark browser
 for_window [class="Mail"] mark mail
 for_window [class="discord"] mark mail
 for_window [app_id="telegramdesktop"] mark mail
-for_window [app_id="firefox" title="^web.whatsapp.com"] mark mail
+for_window [app_id="firefox.*" title="^web.whatsapp.com"] mark mail
 
 for_window [con_mark="browser"] inhibit_idle fullscreen
 
diff --git a/.config/sway/binds.conf b/.config/sway/binds.conf
index 838c78e..193ccd1 100644
--- a/.config/sway/binds.conf
+++ b/.config/sway/binds.conf
@@ -1,11 +1,11 @@
 # vim: ft=i3config
 
 # Basics {{{
-bindsym $mod+Return exec swx -a $term
+bindsym $mod+Return exec $term
 bindsym $mod+Shift+Return exec $floating_term
-bindsym $mod+b exec pkill -USR1 waybar
-bindsym $mod+w exec $firefox
-bindsym $mod+Shift+w exec $firefox --private-window
+# bindsym $mod+b exec pkill -USR1 waybar
+# bindsym $mod+w exec $firefox
+# bindsym $mod+Shift+w exec $firefox --private-window
 
 # kill focused window
 bindsym $mod+Shift+q kill
@@ -240,7 +240,7 @@ bindsym XF86AudioPrev exec playerctl -p playerctld previous
 
 bindsym XF86WakeUp exec true
 # switch video mode
-bindsym XF86Display exec sh -c 'killall kanshi; exec kanshi'
+bindsym XF86Display exec once -K kanshi; exec once kanshi
 # config
 bindsym XF86Tools exec true
 # keyboard
diff --git a/.config/sway/config b/.config/sway/config
index c5b46dd..a6d4521 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -4,20 +4,16 @@ output * scale 1
 output * max_render_time 1
 output * adaptive_sync on
 
-# exec_always sh -c 'killall oguri; exec oguri;'
-exec oguri
-# exec_always sh -c 'killall kanshi; exec kanshi;'
-exec kanshi
-# exec_always sh -c 'killall waybar; exec waybar;'
-exec waybar
-
-#exec doas rc sway
-
 exec light -S 80
-exec redshift
-exec pipewire
-exec mako
-exec swayidle -w \
+
+exec dbus-update-activation-environment --all
+exec once oguri
+exec once kanshi
+exec once waybar
+exec once gammastep
+exec once pipewire
+exec once mako
+exec once swayidle -w \
 	timeout 540 'lock' \
 	timeout 800 'swaymsg output \* dpms off' \
 	     resume 'swaymsg output \* dpms on' \
@@ -81,27 +77,24 @@ set $fat_bpix 5
 default_border pixel $bpix
 default_floating_border pixel $fat_bpix
 
-set $text #FCFAF2
-set $text2 #BDC0BA
+set $text #fffffb
+set $text2 #bdc0ba
 set $bg #1C1C1C
-set $bg2 #434343
+set $bg2 #292929
 set $main  #4e4371
-set $main2 #3e355a
-
-set $urgent #DB4D6D
-set $urgent2 #CB1B45
-# set $indicator #FAD689
-# set $indicator2 #C18A26
-
-# set $indicator #434343
-# set $indicator2 #434343
-set $indicator $bg
-set $indicator2 $bg
-
-client.focused $main2 $main $text $indicator $main
-client.focused_inactive $bg2 $bg $text2 $indicator2 $bg
-client.unfocused $bg2 $bg $text2 $indicator2 $bg
-client.urgent $urgent2 $urgent $text $indicator $urgent
+set $main2 #2e2843
+
+set $urgent #9f353a
+set $urgent2 #662225
+# set $indicator $bg
+# set $indicator2 $bg
+set $indicator_focused $bg2
+set $indicator_unfocused $bg
+
+client.focused $main $main2 $text $indicator_focused $main
+client.focused_inactive $bg $bg $text2 $indicator_unfocused $bg
+client.unfocused $bg2 $bg $text2 $indicator_unfocused $bg
+client.urgent $urgent2 $urgent $text $indicator_focused $urgent
 # }}}
 
 # include config.d/*
diff --git a/.config/sway/env b/.config/sway/env
index 2b76ded..503373c 100644
--- a/.config/sway/env
+++ b/.config/sway/env
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-export TERM=alacritty
-
 export GDK_BACKEND=wayland
 export CLUTTER_BACKEND=wayland
 export QT_QPA_PLATFORM=wayland-egl
@@ -13,14 +11,13 @@ export NO_AT_BRIDGE=1
 export MOZ_ENABLE_WAYLAND=1
 # force gnome apps to use gnome style
 export DESKTOP_SESSION=gnome
-# export QT_QPA_PLATFORMTHEME=qgnomeplatform
 export QT_QPA_PLATFORMTHEME=gnome
-export QT_STYLE_OVERRIDE=Adwaita
+export QT_STYLE_OVERRIDE=adwaita
 export QT_WAYLAND_FORCE_DPI=physical
 
-export XMODIFIERS=@im=ibus
+# export XMODIFIERS=@im=ibus
 export QT_IM_MODULE=ibus
-export GTK_IM_MODULE=xim
+export GTK_IM_MODULE=wayland
 
 export GTK_CSD=0
 
diff --git a/.config/sway/input.conf b/.config/sway/input.conf
index 2635a50..1325cfd 100644
--- a/.config/sway/input.conf
+++ b/.config/sway/input.conf
@@ -1,4 +1,4 @@
-# vim: ft=i3config
+# vim: ft=i3config fdm=marker fen
 
 input 1:1:AT_Translated_Set_2_keyboard {
    xkb_layout us
@@ -10,18 +10,19 @@ input 1:1:AT_Translated_Set_2_keyboard {
 input 65261:25700:Input_Club_Infinity_keyboard/QMK {
    xkb_layout us
    xkb_variant mac
-   xkb_options 'caps:hyper,lvl3:ralt_switch_multikey,eurosign:5'
+  xkb_options 'caps:hyper,lvl3:ralt_switch_multikey,eurosign:5'
    repeat_rate 70
    repeat_delay 200
 }
 input 12951:50895:ZSA_Technology_Labs_Planck_EZ_Glow {
    xkb_layout us
    xkb_variant mac
-   xkb_options 'caps:hyper,lvl3:ralt_switch_multikey,eurosign:5'
+  xkb_options 'caps:hyper,lvl3:ralt_switch_multikey,eurosign:5'
    repeat_rate 70
    repeat_delay 200
 }
 
+# internal trackpad
 input 1739:0:Synaptics_TM3289-021 {
    tap enabled
    natural_scroll enabled
@@ -38,8 +39,8 @@ input 1149:8264:Primax_Kensington_Eagle_Trackball {
 set $slimblade 1149:8257:Kensington_Kensington_Slimblade_Trackball
 input $slimblade {
    accel_profile adaptive
-   pointer_accel 0.5
-   scroll_factor 2
+   # pointer_accel 0.8
+   # scroll_factor 2
 }
 # button layout:
 # ---------
@@ -50,6 +51,10 @@ input $slimblade {
 bindsym --input-device=$slimblade --whole-window button8 seat - cursor press button3, seat - cursor release button3
 bindsym --input-device=$slimblade --whole-window button3 seat - cursor press button8, seat - cursor release button8
 
+input 1133:16500:Logitech_G305 {
+   accel_profile adaptive
+}
+
 set $pen 10429:148:XP-PEN_STAR_G640_Pen
 input $pen {
    accel_profile flat