From 8f0659b9bc0dc15f60e5d389b22f50b21c435b89 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Thu, 11 Jan 2024 10:38:37 +0100
Subject: keyboard: changes

- in sway, use xkb_option to swap lalt and lwin
- remove mapping from caps to escape in xkb symbol file
- use xkb_option to map caps to lwin (for now, but could use caps:escape
  in the future)
---
 sway/config              | 14 +++++++++-----
 xkb/symbols/fr-custom-lx |  4 ++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/sway/config b/sway/config
index 2e2f667..74e0921 100644
--- a/sway/config
+++ b/sway/config
@@ -6,7 +6,11 @@ output 'HDMI-A-2' pos 1920 0
 
 seat '*' hide_cursor 5000
 
-input "*" xkb_layout 'fr-custom-lx'
+input "*" {
+	xkb_layout 'fr-custom-lx'
+	xkb_options 'altwin:swap_lalt_lwin,caps:super'
+	# possible xkb options: localectl list-x11-keymap-options
+}
 
 
 # ---- COLORS & THEME ----
@@ -52,10 +56,10 @@ bindsym $mod+Up focus up
 bindsym $mod+Right focus right
 
 # common shortcuts (alt+tab, etc) for moving around
-bindsym Mod1+Tab focus next
-bindsym Mod1+Shift+Tab focus prev
-bindsym Mod1+Ctrl+Right workspace next
-bindsym Mod1+Ctrl+Left workspace prev
+bindsym $mod+Tab focus next
+bindsym $mod+Shift+Tab focus prev
+bindsym $mod+Ctrl+Right workspace next
+bindsym $mod+Ctrl+Left workspace prev
 
 # move focused window
 bindsym $mod+Shift+H move left
diff --git a/xkb/symbols/fr-custom-lx b/xkb/symbols/fr-custom-lx
index d4c11e9..aaecd1c 100644
--- a/xkb/symbols/fr-custom-lx
+++ b/xkb/symbols/fr-custom-lx
@@ -295,9 +295,9 @@ xkb_symbols "fr-custom-lx" {
         symbols[Group1]= [           space,           space,           space,    nobreakspace,           space,           U202F,        NoSymbol,        NoSymbol ]
     };
 
-    #key <CAPS> {         [       Caps_Lock ] };
+    key <CAPS> {         [       Caps_Lock ] };
     #key <CAPS> {         [       Super_L ] };
-    key <CAPS> {         [       Escape ] };
+    #key <CAPS> {         [       Escape ] };
 
     key <FK01> {
         type= "CTRL+ALT",
-- 
cgit v1.2.3