From f411d00623990aa88c850bdb0fd85de555cf19b5 Mon Sep 17 00:00:00 2001
From: Ambrose Chua <ambrose@hey.com>
Date: Mon, 5 Jul 2021 09:52:35 +0800
Subject: [PATCH] Integrate ctrl:nocaps into xkb

---
 .xkb/symbols/custom | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/.xkb/symbols/custom b/.xkb/symbols/custom
index f790402..0ba4152 100644
--- a/.xkb/symbols/custom
+++ b/.xkb/symbols/custom
@@ -1,22 +1,30 @@
 hidden partial modifier_keys
 xkb_symbols "lctrl_escape" {
-	key <LCTL> { [ Escape ] };
+    key <LCTL> { [ Escape ] };
+};
+
+hidden partial modifier_keys
+xkb_symbols "caps_lctrl" {
+    replace key <CAPS> { [ Control_L, Control_L ] };
+    modifier_map  Control { <CAPS>, <LCTL> };
 };
 
 partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "us(basic)"
-    name[Group1]= "English (US) (lctrl_escape)";
+    name[Group1]= "English (Qwerty)";
 
     include "custom(lctrl_escape)"
+    include "custom(caps_lctrl)"
 };
 
-partial alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "dvp" {
 
     include "us(dvp)"
-    name[Group1]= "English (Programmer Dvorak) (lctrl_escape)";
+    name[Group1]= "English (Programmer Dvorak)";
 
     include "custom(lctrl_escape)"
+    include "custom(caps_lctrl)"
 };