Diff
1diff --git a/.chezmoiignore b/.chezmoiignore
2index 00ed871185572b8004060881c21fa00b604dd2f8..f50989b98c60f35a781246aade3c81e7260c88b3 100644
3--- a/.chezmoiignore
4+++ b/.chezmoiignore
5@@ -2,6 +2,6 @@ LICENSE
6 init.sh
7 go.mod
8 go.sum
9-custom_colemak
10+us_colemak.patch
11 config_template.yaml
12 .config/nvim/lazy-lock.json
13diff --git a/custom_colemak b/custom_colemak
14deleted file mode 100644
15index 6e6d780884ce3d9dab5d12b3c853d8420faa41eb..0000000000000000000000000000000000000000
16--- a/custom_colemak
17+++ /dev/null
18@@ -1,11 +0,0 @@
19-
20-// Custom colemak addition to map Control to Caps
21-partial modifier_keys
22-xkb_symbols "colemak-custom" {
23- include "us(colemak)"
24- name[Group1] = "English (custom, colemak)";
25-
26- key <CAPS> { [ Control_L ] };
27-
28- modifier_map Control { <CAPS> };
29-};
30diff --git a/init.sh b/init.sh
31index 3b90bc4986ce39337fe4348016324a9e99ca1687..1b2d2eddf27f87ddc2c55c5b0a7f7eb9de3dc38d 100755
32--- a/init.sh
33+++ b/init.sh
34@@ -24,7 +24,7 @@ git clone https://gitea.theedgeofrage.com/TheEdgeOfRage/boban-zsh ${ohmyzsh_cust
35 git clone https://github.com/hlissner/zsh-autopair ${ohmyzsh_custom}/plugins/zsh-autopair
36
37 # Keyboard layout
38-cat ./custom_colemak | sudo tee -a /usr/share/X11/xkb/symbols/us
39+sudo patch /usr/share/X11/xkb/symbols/us < ./us_colemak.patch
40
41 # SSH agent
42 sudo pacman -S gcr
43diff --git a/us_colemak.patch b/us_colemak.patch
44new file mode 100644
45index 0000000000000000000000000000000000000000..da53ebf9d7f522ae1979ca9b00f2393de3353792
46--- /dev/null
47+++ b/us_colemak.patch
48@@ -0,0 +1,22 @@
49+--- og 2025-06-14 00:13:21.324848233 +0200
50++++ colemak 2025-06-14 00:13:08.136756515 +0200
51+@@ -862,6 +862,19 @@
52+ key <CAPS> { [ BackSpace ] };
53+ };
54+
55++// Custom colemak addition to map Control to Caps
56++partial modifier_keys
57++xkb_symbols "colemak_control" {
58++
59++ include "us(colemak_base)"
60++
61++ name[Group1] = "English (control, Colemak)";
62++
63++ key <CAPS> { [ Control_L ] };
64++
65++ modifier_map Control { <CAPS> };
66++};
67++
68+ // Colemak-DH (ANSI) symbols for xkb on X.Org Server 7.x
69+ // 2014-10-25 by SteveP, https://colemakmods.github.io/mod-dh/
70+