From 7964d2b77632a560ea8f208a0faf42c2c9cc85bb Mon Sep 17 00:00:00 2001
From: Konstantin Koslowski <konstantin.koslowski@posteo.de>
Date: Fri, 18 Mar 2022 08:08:21 +0100
Subject: [PATCH] sway: redesign usage of scratchpad and marks

---
 config | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/config b/config
index 640184b..2968127 100644
--- a/config
+++ b/config
@@ -181,7 +181,7 @@ bindsym $mod+f fullscreen
 # Toggle the current focus between tiling and floating mode
 bindsym $mod+Shift+space floating toggle
 # Toggle border/titlebar
-bindsym $mod+Shift+b border toggle
+bindsym $mod+Control+b border toggle
 
 # Swap focus between the tiling area and the floating area
 bindsym $mod+space focus mode_toggle
@@ -227,13 +227,7 @@ gaps right 0
 # Scratchpad:
 #
 # Move the currently focused window to the scratchpad
-bindsym $mod+Shift+a mark a; move scratchpad
-bindsym $mod+Shift+s mark s; move scratchpad
-bindsym $mod+Shift+d mark d; move scratchpad
-bindsym $mod+Shift+z mark z; floating enable; resize set width 1250; resize set height 800; move scratchpad
-bindsym $mod+Shift+x mark x; floating enable; resize set width 1250; resize set height 800; move scratchpad
-bindsym $mod+Shift+c mark c; floating enable; resize set width 1250; resize set height 800; move scratchpad
-# bindsym $mod+s [con_mark="^(?!(c|d)$)"] scratchpad show
+bindsym $mod+Shift+s move scratchpad
 bindsym $mod+Ctrl+s scratchpad show
 bindsym $mod+a [con_mark="a" tiling=True] focus; [con_mark="a" floating=True] scratchpad show;
 bindsym $mod+s [con_mark="s" tiling=True] focus; [con_mark="s" floating=True] scratchpad show;
@@ -290,10 +284,21 @@ mode "move" {
     bindsym $mod+k focus up
     bindsym $mod+l focus right
     # Return to default mode
-    bindsym Return mode "default"
-    bindsym Escape mode "default"
+    bindsym Return exec notify-send "mode: default"; mode "default"
+    bindsym Escape exec notify-send "mode: default"; mode "default"
 }
-bindsym $mod+m mode "move"
+mode "mark" {
+    bindsym a mark a
+    bindsym s mark s
+    bindsym d mark d
+    bindsym z mark z
+    bindsym x mark x
+    bindsym c mark c
+    bindsym Return exec notify-send "mode: default"; mode "default"
+    bindsym Escape exec notify-send "mode: default"; mode "default"
+}
+bindsym $mod+m exec notify-send "mode: move"; mode "move"
+bindsym $mod+Shift+a exec notify-send "mode: mark";  mode "mark"
 
 #
 # Window Rules:
@@ -328,7 +333,7 @@ exec_always $HOME/.config/sway/bin/start_waybar.sh
 #
 # Autostart
 #
-exec --no-startup-id nextcloud --background
+exec "bash -c 'sleep 10; nextcloud --background'"
 exec --no-startup-id dunst
 exec --no-startup-id nm-applet --indicator