From a7da3f8e944cfa280436425442607ae1aadeef32 Mon Sep 17 00:00:00 2001
From: Miles Alan <m@milesalan.com>
Date: Sat, 7 Mar 2020 10:34:03 -0600
Subject: [PATCH] Add custom layouts

---
 layout.en.h      | 118 +++++++++++++++++++++--------------------------
 layout.symbols.h |  58 +++++++++++++++++++++++
 2 files changed, 111 insertions(+), 65 deletions(-)
 create mode 100644 layout.symbols.h

diff --git a/layout.en.h b/layout.en.h
index b7291b5..2c8cd57 100644
--- a/layout.en.h
+++ b/layout.en.h
@@ -1,70 +1,58 @@
 static Key keys[] = {
-	{ "1!", XK_1, 1 },
-	{ "2@", XK_2, 1 },
-	{ "3#", XK_3, 1 },
-	{ "4$", XK_4, 1 },
-	{ "5%", XK_5, 1 },
-	{ "6^", XK_6, 1 },
-	{ "7&", XK_7, 1 },
-	{ "8*", XK_8, 1 },
-	{ "9(", XK_9, 1 },
-	{ "0)", XK_0, 1 },
-	{ "-_", XK_minus, 1 },
-	{ "=+", XK_plus, 1 },
-	{ "<-", XK_BackSpace, 2 },
-	{ 0 }, /* New row */
-	{ "->|", XK_Tab, 1 },
-	{ 0, XK_q, 1 },
-	{ 0, XK_w, 1 },
-	{ 0, XK_e, 1 },
-	{ 0, XK_r, 1 },
-	{ 0, XK_t, 1 },
-	{ 0, XK_y, 1 },
-	{ 0, XK_u, 1 },
-	{ 0, XK_i, 1 },
-	{ 0, XK_o, 1 },
-	{ 0, XK_p, 1 },
-	{ "[", XK_bracketleft, 1 },
-	{ "]", XK_bracketright, 1 },
-	{ "Return", XK_Return, 3 },
-	{ 0 }, /* New row */
-	{ 0, XK_Caps_Lock, 2 },
-	{ 0, XK_a, 1 },
-	{ 0, XK_s, 1 },
-	{ 0, XK_d, 1 },
-	{ 0, XK_f, 1 },
-	{ 0, XK_g, 1 },
-	{ 0, XK_h, 1 },
-	{ 0, XK_j, 1 },
-	{ 0, XK_k, 1 },
-	{ 0, XK_l, 1 },
-	{ ":;", XK_semicolon, 1 },
-	{ "'\"", XK_exclam, 1 },
-	{ "\\|", XK_backslash, 1 },
-	{ 0 }, /* New row */
-	{ 0, XK_Shift_L, 3 },
-	{ 0, XK_z, 1 },
-	{ 0, XK_x, 1 },
-	{ 0, XK_c, 1 },
-	{ 0, XK_v, 1 },
-	{ 0, XK_b, 1 },
-	{ 0, XK_n, 1 },
-	{ 0, XK_m, 1 },
-	{ ",", XK_colon, 1 },
-	{ ".", XK_period, 1 },
-	{ "/?", XK_slash, 1 },
-	{ 0, XK_Shift_R, 2 },
-	{ 0 }, /* New row */
-	{ "Ctrl", XK_Control_L, 2 },
-	{ "Alt", XK_Alt_L, 2 },
-	{ "", XK_space, 5 },
-	{ "Alt", XK_Alt_R, 2 },
-	{ "Ctrl", XK_Control_R, 2 },
-	{ "[X]", XK_Cancel, 1},
+        { 0, XK_q, 1 },
+        { 0, XK_w, 1 },
+        { 0, XK_e, 1 },
+        { 0, XK_r, 1 },
+        { 0, XK_t, 1 },
+        { 0, XK_y, 1 },
+        { 0, XK_u, 1 },
+        { 0, XK_i, 1 },
+        { 0, XK_o, 1 },
+        { 0, XK_p, 1 },
+
+        { 0 }, /* New row */
+
+
+        { 0, XK_a, 1 },
+        { 0, XK_s, 1 },
+        { 0, XK_d, 1 },
+        { 0, XK_f, 1 },
+        { 0, XK_g, 1 },
+        { 0, XK_h, 1 },
+        { 0, XK_j, 1 },
+        { 0, XK_k, 1 },
+        { 0, XK_l, 1 },
+        { ";:", XK_colon, 1 },
+        /*{ "'", XK_apostrophe, 2 },*/
+
+        { 0 }, /* New row */
+
+        { 0, XK_z, 1 },
+        { 0, XK_x, 1 },
+        { 0, XK_c, 1 },
+        { 0, XK_v, 1 },
+        { 0, XK_b, 1 },
+        { 0, XK_n, 1 },
+        { 0, XK_m, 1 },
+        /*{ "/?", XK_slash, 1 },*/
+        { "Tab", XK_Tab, 1 },
+        { "<-", XK_BackSpace, 2 },
+
+        { 0 }, /* New row */
+        { "Layer 2", XK_Cancel, 1},
+        { "Shift", XK_Shift_L, 1 },
+        /*{ "L", XK_Left, 1 },*/
+        { "D", XK_Down, 1 },
+        { "U", XK_Up, 1 },
+        /*{ "R", XK_Right, 1 },*/
+        { "", XK_space, 2 },
+        { "Esc", XK_Escape, 1 },
+        { "Ctrl", XK_Control_L, 1 },
+        /*{ "Alt", XK_Alt_L, 1 },*/
+        { "Enter", XK_Return, 2 },
 };
 
 Buttonmod buttonmods[] = {
-	{ XK_Shift_L, Button2 },
-	{ XK_Alt_L, Button3 },
+        { XK_Shift_L, Button2 },
+        { XK_Alt_L, Button3 },
 };
-
diff --git a/layout.symbols.h b/layout.symbols.h
new file mode 100644
index 0000000..84d17a8
--- /dev/null
+++ b/layout.symbols.h
@@ -0,0 +1,58 @@
+static Key keys[] = {
+
+  
+  { "1!", XK_1, 1 },
+  { "2@", XK_2, 1 },
+  { "3#", XK_3, 1 },
+  { "4$", XK_4, 1 },
+  { "5%", XK_5, 1 },
+  { "6^", XK_6, 1 },
+  { "7&", XK_7, 1 },
+  { "8*", XK_8, 1 },
+  { "9(", XK_9, 1 },
+  { "0)", XK_0, 1 },
+
+  { 0 }, /* New row */
+
+  { "'\"", XK_apostrophe, 1 },
+  { "`~", XK_grave, 1 },
+  { "-_", XK_minus, 1 },
+  { "=+", XK_plus, 1 },
+  { "[{", XK_bracketleft, 1 },
+  { "]}", XK_bracketright, 1 },
+  { ",<", XK_comma, 1 },
+  { ".>", XK_period, 1 },
+  { "/?", XK_slash, 1 },
+  { "\\", XK_backslash, 1 },
+
+  { 0 }, /* New row */
+
+  { "|", XK_Shift_L|XK_bar, 1 },
+  { "L", XK_Left, 1 },
+  { "R", XK_Right, 1 },
+  { "Ctrl-C", XK_Shift_L|XK_bar, 1 },
+  { "Ctrl-L", XK_Shift_L|XK_bar, 1 },
+  { "Ctrl-V", XK_Shift_L|XK_bar, 1 },
+  { "Ctrl-D", XK_Shift_L|XK_bar, 1 },
+  { "TAB", XK_Tab, 1 },
+  { "<-", XK_BackSpace, 2 },
+
+  { 0 }, /* New row */
+  { "Layer 1", XK_Cancel, 1},
+  { "Shift", XK_Shift_L, 1 },
+  /*{ "L", XK_Left, 1 },*/
+  { "D", XK_Down, 1 },
+  { "U", XK_Up, 1 },
+  /*{ "R", XK_Right, 1 },*/
+  { "", XK_space, 2 },
+  { "Esc", XK_Escape, 1 },
+  { "Ctrl", XK_Control_L, 1 },
+  /*{ "Alt", XK_Alt_L, 1 },*/
+  { "Enter", XK_Return, 2 },
+};
+
+Buttonmod buttonmods[] = {
+	{ XK_Shift_L, Button2 },
+	{ XK_Alt_L, Button3 },
+};
+