reduce use of Shift modifier in i3 & Sway configs

3 files changed, 18 insertions, 16 deletions

diff --git a/.config/i3/config b/.config/i3/config
index 702fb7b7..e20d1df3 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -62,10 +62,11 @@ mode "C-i-" {
 	bindsym e exec emacsclient -ncw15, mode "default"
 
 	# override the script's usual logic to start a fresh, non-debug daemon
-	bindsym Shift+e exec emacsclient -ncw8 --spw/installed, mode "default"
+	bindsym Ctrl+Mod1+e exec emacsclient -ncw8 --spw/installed, \
+		mode "default"
 
 	# special daemon instance for debugging primary instance & Gnus
-	bindsym Mod1+e exec emacsclient -ncw8 -sgdbmacs, mode "default"
+	bindsym r exec emacsclient -ncw8 -sgdbmacs, mode "default"
 
 	# Fresh Emacs frame and get a shell in HOME.  Without this it's
 	# C-i e M-& which is too many keys esp. compared to C-i DEL
@@ -91,7 +92,7 @@ mode "C-i-" {
                 mode "default"
 
         # go to sleep -- xss-lock will lock screen
-        bindsym Shift+l exec systemctl suspend, mode "default"
+        bindsym Ctrl+l exec systemctl suspend, mode "default"
 
         # kill focused window
 	# Unlike in sway config we don't send USR1 to i3status-wrapper because
@@ -101,7 +102,7 @@ mode "C-i-" {
         bindsym k kill, mode "default"
 
         # start dmenu (a program launcher)
-        bindsym Shift+p exec dmenu_run \
+        bindsym Ctrl+p exec dmenu_run \
                 -nf '#000000' -nb '#FFFFF6' -sb '#B4EEB4' -sf '#000000', \
                 mode "default"
 
@@ -223,14 +224,14 @@ mode "C-i-" {
 
         # reload the configuration file -- useful simply to reexecute
         # startup scripts
-        bindsym c reload; \
+        bindsym Ctrl+Mod1+c reload; \
                 exec --no-startup-id ~/src/dotfiles/scripts/desktop/i3-startup-always, \
                 mode "default"
         # restart i3 inplace (preserves your layout/session, can be
         # used to upgrade i3)
-        bindsym Ctrl+Shift+r restart, mode "default"
+        bindsym Ctrl+Mod1+r restart, mode "default"
         # exit i3 (logs you out of your X session)
-        bindsym Ctrl+Shift+e exec "i3-nagbar -t warning \
+        bindsym Ctrl+Mod1+Shift+e exec "i3-nagbar -t warning \
 		-m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' \
 		-b 'Yes, exit i3' 'i3-msg exit'", mode "default"
 
diff --git a/.config/sway/config b/.config/sway/config
index e1a657ae..981e01d5 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -41,10 +41,11 @@ mode "C-i-" {
 	bindsym e exec emacsclient -ncw15, mode "default"
 
 	# override the script's usual logic to start a fresh, non-debug daemon
-	bindsym Shift+e exec emacsclient -ncw8 --spw/installed, mode "default"
+	bindsym Ctrl+Mod1+e exec emacsclient -ncw8 --spw/installed, \
+		mode "default"
 
 	# special daemon instance for debugging primary instance & Gnus
-	bindsym Mod1+e exec emacsclient -ncw8 -sgdbmacs, mode "default"
+	bindsym r exec emacsclient -ncw8 -sgdbmacs, mode "default"
 
 	# Fresh Emacs frame and get a shell in HOME.  Without this it's
 	# C-i e M-& which is too many keys esp. compared to C-i DEL
@@ -68,7 +69,7 @@ mode "C-i-" {
         bindsym l exec loginctl lock-session, mode "default"
 
         # go to sleep -- swayidle will lock screen
-        bindsym --locked Shift+l exec systemctl suspend, mode "default"
+        bindsym --locked Ctrl+l exec systemctl suspend, mode "default"
 
         # kill focused window
         bindsym k kill, mode "default"
@@ -78,7 +79,7 @@ mode "C-i-" {
 
         bindsym p exec wofi --show=drun -i, mode "default"
 
-        bindsym Shift+p exec wofi --show=run -i, mode "default"
+        bindsym Ctrl+p exec wofi --show=run -i, mode "default"
 
 	bindsym s exec ~/src/dotfiles/scripts/desktop/wofi_ssh, mode "default"
 
@@ -188,14 +189,14 @@ mode "C-i-" {
 	bindsym slash exec ~/src/dotfiles/scripts/desktop/wofi_window, mode "default"
 
         # reload the configuration file
-        bindsym Ctrl+Shift+c reload, mode "default"
+        bindsym Ctrl+Mod1+c reload, mode "default"
         # exit i3 (logs you out of your X session)
-        bindsym Ctrl+Shift+e exit
+        bindsym Ctrl+Mod1+Shift+e exit
 
         bindsym g mode "C-i g-"
 
         # bindsym bracketleft exec debian-ftp-master-cut-note, mode "default"
-        # bindsym Shift+bracketleft exec xdo-evince-highlight, mode "default"
+        # bindsym Ctrl+bracketleft exec xdo-evince-highlight, mode "default"
 
         # Workspaces do not ever get assigned to particular purposes / windows
         # don't get assigned to particular workspaces.  If I can't find where
@@ -226,7 +227,7 @@ mode "C-i-" {
 
 	bindsym c [con_mark=caffeinated] inhibit_idle none; \
 	        mark --toggle caffeinated; mode "default"
-	bindsym Shift+c [con_mark=caffeinated] inhibit_idle none; \
+	bindsym Ctrl+c [con_mark=caffeinated] inhibit_idle none; \
 		[con_mark=caffeinated] mark --toggle caffeinated; mode "default"
 
 	# The two % values are for melete.  Cf. `spw/maybe-scale-basic-faces'.
diff --git a/bin/emacsclient b/bin/emacsclient
index f140df52..4864efdd 100755
--- a/bin/emacsclient
+++ b/bin/emacsclient
@@ -225,7 +225,7 @@ if [ -n "$listener" ]; then
 fi
 
 # Make it possible, with primary session, to quickly replace in-tree Emacs
-# with installed Emacs.  See 'C-i E' Sway/i3 binding.
+# with installed Emacs.  See 'C-i C-M-e' Sway/i3 binding.
 if [ -z "$daemon_name" ] && $devel_running && $want_installed; then
     gud_status \
 	|| fail "couldn't query gdbmacs for in-tree Emacs status; aborting"