Improve keyd mappings

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