Rolled back to custom CH, will move to custom GB keyboard after algo

3 files changed, 26 insertions, 2 deletions

diff --git a/.xkb/desktop b/.xkb/desktop
index b6aa73e..54792c0 100644
--- a/.xkb/desktop
+++ b/.xkb/desktop
@@ -3,6 +3,6 @@ xkb_keymap {
 	xkb_keycodes  { include "evdev+aliases(qwerty)"	};
 	xkb_types     { include "complete"	};
 	xkb_compat    { include "complete"	};
-	xkb_symbols   { include "pc+gb+inet(evdev)+custom(desktop)"	};
+	xkb_symbols   { include "pc+ch+inet(evdev)+ch-custom(desktop)"	};
 	xkb_geometry  { include "pc(pc105)"	};
 };
diff --git a/.xkb/symbols/ch-custom b/.xkb/symbols/ch-custom
new file mode 100644
index 0000000..66cd95d
--- /dev/null
+++ b/.xkb/symbols/ch-custom
@@ -0,0 +1,24 @@
+default partial alphanumeric_keys
+xkb_symbols "basic" {
+    key <AE07> { [          7,     dollar,     sterling             ] };
+    key <BKSL> { [      slash,        bar,   braceright             ] };
+    key <CAPS> { [      Escape ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "desktop" {
+    include "ch-custom(basic)"
+
+    key <MENU> { [      Super_R ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "x1" {
+    include "ch-custom(basic)"
+
+    key <PRSC> { [    Super_R ] };
+    key <PGUP> { [       Home ] };
+    key <PGDN> { [        End ] };
+    key <END>  { [  Page_Down ] };
+    key <HOME> { [    Page_Up ] };
+};
diff --git a/.xkb/x1 b/.xkb/x1
index 5938fb4..4e5bad2 100644
--- a/.xkb/x1
+++ b/.xkb/x1
@@ -3,6 +3,6 @@ xkb_keymap {
 	xkb_keycodes  { include "evdev+aliases(qwerty)"	};
 	xkb_types     { include "complete"	};
 	xkb_compat    { include "complete"	};
-	xkb_symbols   { include "pc+gb+inet(evdev)+custom(x1)"	};
+	xkb_symbols   { include "pc+ch+inet(evdev)+ch-custom(x1)"	};
 	xkb_geometry  { include "pc(pc105)"	};
 };