From 95f1df25c12c156422ad47e1e82bd8bb131ab1fd Mon Sep 17 00:00:00 2001
From: Mark Hoekveen <mark@hoekveen.net>
Date: Sun, 8 Sep 2024 23:00:18 +0200
Subject: [PATCH] return of the sway

---
 .config/sway/config | 51 ++++++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/.config/sway/config b/.config/sway/config
index 0f4bf3d..d48b149 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -16,7 +16,7 @@ set $ws6 6
 set $ws7 7
 set $ws8 8 
 set $ws9 9
-set $ws10 0
+set $ws10 10
 
 # Input/output configuration
 input "*" {
@@ -29,9 +29,7 @@ output * bg $color0 solid_color
 output * bg $wallpaper fill
 #exec wal -c
 #exec wal -i $wallpaper
-exec autotiling
-exec --no-startup-id fcitx -d
-
+exec_always autotiling
 
 include workspaces
 include display
@@ -63,11 +61,9 @@ bar {
 exec_always ~/.config/mako/launch.sh
 
 # Window border colors. Transparent borders on unfocused windows
-client.focused			$color0	$color0	$color0	$color4	$color4
-client.focused_inactive		$color0 $color0 $color0 $color0 $color0
-
-# Wallpaper script
-include wallpaper
+client.focused			$color1	$color1	$color0
+client.focused_inactive		$color1 $color1 $color6
+client.unfocused		$color0 $color0 $color2
 
 # General bindings
 bindsym $mod+Return		exec $term
@@ -75,7 +71,8 @@ bindsym $mod+q			kill
 bindsym $mod+d			exec $launcher 
 bindsym $mod+Ctrl+d		exec $launcher
 bindsym $mod+Shift+c		reload
-bindsym $mod+f			fullscreen
+bindsym $mod+f			fullscreen toggle
+bindsym $mod+Shift+f		layout toggle tabbed splith
 bindsym $mod+Shift+space	floating toggle
 bindsym $mod+space		focus mode_toggle
 bindsym $mod+minus		scratchpad show
@@ -98,12 +95,17 @@ bindsym $mod+a			exec $term -e cava
 bindsym $mod+Shift+a		exec $term -e pulsemixer
 bindsym $mod+i			exec $term -e htop --user mark
 bindsym $mod+Shift+i		exec $term -e btop
-bindsym $mod+Shift+d		exec discord --enable-features=UseOzonePlatform --ozone-platform=wayland 
+#bindsym $mod+Shift+d		exec discord --enable-features=UseOzonePlatform --ozone-platform=wayland 
+#bindsym $mod+Shift+d		exec vesktop --enable-features=UseOzonePlatform --ozone-platform=wayland 
+bindsym $mod+Shift+d		exec equibop --enable-features=UseOzonePlatform --ozone-platform=wayland 
 bindsym $mod+Shift+m		exec $term -e ncmpcpp
 bindsym $mod+Ctrl+m		exec catia
 bindsym $mod+m			exec spotify
+bindsym $mod+n			exec mozillavpn activate
+bindsym $mod+o			exec ~/.scripts/wallpaper
+bindsym $mod+Shift+o		exec ~/.scripts/wallpaper-upload
 bindsym $mod+p			exec pass clip -r
-bindsym $mod+Shift+Return		exec $term -e python
+bindsym $mod+Shift+Return	exec $term -e python
 bindsym $mod+Shift+t		exec teams
 
 # Screenshotting
@@ -111,11 +113,7 @@ bindsym Print			exec grim -g "$(slurp)" - | wl-copy
 bindsym Ctrl+Print		exec grim -g "$(slurp)" ~/screenshot.png && notify-send -i ~/screenshot.png "Screenshot saved"
 bindsym Shift+Ctrl+Print	exec grim ~/screenshot.png
 bindsym Shift+Print		exec grim -g "$(slurp)" - | swappy -f -
-
-# Spotify control
-bindsym $mod+Ctrl+$right	exec dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Next
-bindsym $mod+Ctrl+$left		exec dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Next
-bindsym $mod+Ctrl+space		exec dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.PlayPause
+bindsym $mod+T			exec grim -g "$(slurp)" ~/screenshot.png && tesseract ~/screenshot.png stdout | wl-copy
 
 # Moving around
 bindsym $mod+$left		focus left
@@ -140,7 +138,7 @@ bindsym $mod+$ws6		workspace $ws6
 bindsym $mod+$ws7		workspace $ws7
 bindsym $mod+$ws8		workspace $ws8
 bindsym $mod+$ws9		workspace $ws9
-bindsym $mod+$ws10		workspace $ws10
+bindsym $mod+0	    		workspace $ws10
 
 bindsym $mod+Shift+$ws1		move workspace $ws1
 bindsym $mod+Shift+$ws2		move workspace $ws2
@@ -151,13 +149,14 @@ bindsym $mod+Shift+$ws6		move workspace $ws6
 bindsym $mod+Shift+$ws7		move workspace $ws7
 bindsym $mod+Shift+$ws8		move workspace $ws8
 bindsym $mod+Shift+$ws9		move workspace $ws9
-bindsym $mod+Shift+$ws10	move workspace $ws10
+bindsym $mod+Shift+0		move workspace $ws10
 
 set $scr_smol DP-3
 set $scr_bige DP-2
 
-output $scr_bige resolution 2560x1440 position 0 0
+#output $scr_bige resolution 3840x2160 position 0 0
 #output $scr_bige scale 1.5
+output $scr_bige resolution 2560x1440 position 0 0
 output $scr_smol mode --custom 1920x1080 position 2560 0 
 output $scr_smol adaptive_sync off
 
@@ -172,12 +171,16 @@ workspace $ws10 output $scr_smol
 # App fixes
 assign [class="discord"] $ws3
 assign [app_id="discord"] $ws3
-assign [class="lightcord"] $ws3
+assign [app_id="vesktop"] $ws3
+assign [app_id="equibop"] $ws3
 for_window [class="discord"] move workspace $ws3
 for_window [app_id="discord"] move workspace $ws3
-for_window [class="lightcord"] move workspace $ws3
-assign [class="Steam"] $ws4
-for_window [class="Steam"] move workspace $ws4
+for_window [app_id="vesktop"] move workspace $ws3
+for_window [app_id="equibop"] move workspace $ws3
+assign [class="steam"] $ws4
+assign [app_id="steam"] $ws4
+for_window [class="steam"] move workspace $ws4
+for_window [app_id="steam"] move workspace $ws4
 for_window [title="Firefox — Sharing Indicator"] floating enable
 for_window [title="Firefox — Sharing Indicator"] nofocus