From 817e776f6e58364f4664dea307ab2681748518e8 Mon Sep 17 00:00:00 2001
From: cubernetes <timo42@proton.me>
Date: Thu, 15 Oct 2026 15:46:46 +0200
Subject: [PATCH] Improve keyd mappings

---
 hosts/fw/configuration.nix | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/hosts/fw/configuration.nix b/hosts/fw/configuration.nix
index 46ca1aa..faecbc0 100644
--- a/hosts/fw/configuration.nix
+++ b/hosts/fw/configuration.nix
@@ -208,12 +208,29 @@ with lib;
         extraConfig = ''
           [main]
           leftcontrol = layer(lctrl)
-          leftalt = layer(lalt)
+
           leftshift = layer(lshift)
+          rightshift = layer(lshift)
+
+          # Swapped layout
+          # leftalt = layer(lsuper)
+          # rightalt = layer(rsuper)
+
+          # leftmeta = layer(lalt)
+          # rightmeta = layer(altgr)
+
+          # Normal layout
+          leftalt = layer(lalt)
+          rightalt = layer(altgr)
+
           leftmeta = layer(lsuper)
-          altgr = layer(rightalt)
+          rightmeta = layer(rsuper)
+
+          capslock = layer(lctrl)
 
           [lctrl:C]
+          j = enter
+          leftbrace = escape
 
           [lalt:A]
 
@@ -221,8 +238,13 @@ with lib;
 
           [lsuper:M]
 
+          [rsuper:M]
+
           [altgr:G]
 
+          [lctrl+lshift]
+          h = backspace
+
           [lalt+lctrl]
           h = left
           j = down