From 9be73a71de971f1a62e57ebda65e8f2bfd9db6e1 Mon Sep 17 00:00:00 2001
From: Josh Rahm <rahm@google.com>
Date: Tue, 6 Sep 2022 13:43:34 -0600
Subject: jr: remove group2 nonsense.

---
 jr | 198 +++++++++++++++++++++++----------------------------------------------
 1 file changed, 66 insertions(+), 132 deletions(-)

diff --git a/jr b/jr
index 2c0f33a..5e8e8ab 100644
--- a/jr
+++ b/jr
@@ -4,7 +4,6 @@
 default partial alphanumeric_keys
 xkb_symbols "josh-dvorak-intl" {
   name[Group1]= "English (Josh, Dvorak, international with dead keys)";
-  name[Group2]= "English (Josh, Dvorak, Vi Mode)";
 
   include "us(dvorak)"
 
@@ -26,41 +25,32 @@ xkb_symbols "josh-dvorak-intl" {
   };
 
   key <LWIN> {
-    symbols[Group1] = [Control_L, Control_L, Control_L, Control_L, Control_L, Control_L, Control_L, Control_L],
-    symbols[Group2] = []
+    symbols[Group1] = [Control_L, Control_L, Control_L, Control_L, Control_L, Control_L, Control_L, Control_L]
   };
   key <RWIN> {
     type[Group1]="ONE_LEVEL", symbols[Group1]=[ISO_Level3_Shift]
-    // symbols[Group1] = [Control_R, Control_R, Control_R, Control_R, Control_R, Control_R, Control_R, Control_R],
-    // symbols[Group2] = []
+    // symbols[Group1] = [Control_R, Control_R, Control_R, Control_R, Control_R, Control_R, Control_R, Control_R]
   };
   key <LCTL> {
-    symbols[Group1] = [Hyper_L, Hyper_L, Hyper_L, Hyper_L, Hyper_L, Hyper_L, Hyper_L, Hyper_L],
-    symbols[Group2] = []
+    symbols[Group1] = [Hyper_L, Hyper_L, Hyper_L, Hyper_L, Hyper_L, Hyper_L, Hyper_L, Hyper_L]
   };
   key <RTSH> {
-    symbols[Group1] = [ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift],
-    symbols[Group2] = []
+    symbols[Group1] = [ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift]
   };
   key <CAPS> {
-    symbols[Group1] = [Escape, Escape, Home, Home, User, Pointer_EnableKeys, Delete, Delete],
-    symbols[Group2] = []
+    symbols[Group1] = [Escape, Escape, Home, Home, User, Pointer_EnableKeys, Delete, Delete]
   };
   key <RTRN> {
-    symbols[Group1] = [Return, Return],
-    symbols[Group2] = []
+    symbols[Group1] = [Return, Return]
   }; // ‹Return›
   key <BKSP> {
-    symbols[Group1] = [BackSpace],
-    symbols[Group2] = []
+    symbols[Group1] = [BackSpace]
   };
   key <TAB> {
-    symbols[Group1] = [Super_L, ISO_Left_Tab],
-    symbols[Group2] = []
+    symbols[Group1] = [Super_L, ISO_Left_Tab]
   };
   key <RCTL> {
-    symbols[Group1] = [Super_L, Super_L],
-    symbols[Group2] = []
+    symbols[Group1] = [Super_L, Super_L]
   };
 
   modifier_map Mod4 {<RCTL>, <TAB>};
@@ -73,8 +63,7 @@ xkb_symbols "josh-dvorak-intl" {
   modifier_map Mod5 {<RALT>};
 
   key <RTSH> {
-    symbols[Group1] = type[Group1]="ONE_LEVEL", symbols[Group1]=[ISO_Level5_Shift],
-    symbols[Group2] = []
+    symbols[Group1] = type[Group1]="ONE_LEVEL", symbols[Group1]=[ISO_Level5_Shift]
   };
   modifier_map Lock {<RTSH> };
 
@@ -90,228 +79,174 @@ xkb_symbols "josh-dvorak-intl" {
   };
 
   key <TLDE> {
-    symbols[Group1] = [grave, asciitilde, dead_grave, dead_tilde],
-    symbols[Group2] = []
+    symbols[Group1] = [grave, asciitilde, dead_grave, dead_tilde]
   };
   key <AE01> {
-    symbols[Group1] = [1, exclam, exclamdown, onesuperior, U2081, U00B9],
-    symbols[Group2] = []
+    symbols[Group1] = [1, exclam, exclamdown, onesuperior, U2081, U00B9]
   };
   key <AE02> {
-    symbols[Group1] = [2, at, twosuperior, dead_doubleacute, U2082, U00B2],
-    symbols[Group2] = []
+    symbols[Group1] = [2, at, twosuperior, dead_doubleacute, U2082, U00B2]
   };
   key <AE03> {
-    symbols[Group1] = [3, numbersign, threesuperior, dead_macron, U2083, threesuperior],
-    symbols[Group2] = []
+    symbols[Group1] = [3, numbersign, threesuperior, dead_macron, U2083, threesuperior]
   };
   key <AE04> {
-    symbols[Group1] = [4, dollar, currency, sterling, U2084, U2074],
-    symbols[Group2] = []
+    symbols[Group1] = [4, dollar, currency, sterling, U2084, U2074]
   };
   key <AE05> {
-    symbols[Group1] = [5, percent, EuroSign, dead_cedilla, U2085, U2075],
-    symbols[Group2] = []
+    symbols[Group1] = [5, percent, EuroSign, dead_cedilla, U2085, U2075]
   };
   key <AE06> {
-    symbols[Group1] = [6, dead_circumflex, onequarter, asciicircum, U2086, U2076],
-    symbols[Group2] = []
+    symbols[Group1] = [6, dead_circumflex, onequarter, asciicircum, U2086, U2076]
   };
   key <AE07> {
-    symbols[Group1] = [7, ampersand, onehalf, dead_horn, U2087, U2077],
-    symbols[Group2] = []
+    symbols[Group1] = [7, ampersand, onehalf, dead_horn, U2087, U2077]
   };
   key <AE08> {
-    symbols[Group1] = [8, asterisk, threequarters, dead_ogonek, U2088, U2078, infinity],
-    symbols[Group2] = []
+    symbols[Group1] = [8, asterisk, threequarters, dead_ogonek, U2088, U2078, infinity]
   };
   key <AE09> {
-    symbols[Group1] = [9, parenleft, leftsinglequotemark, dead_breve, U2089, U2079],
-    symbols[Group2] = []
+    symbols[Group1] = [9, parenleft, leftsinglequotemark, dead_breve, U2089, U2079]
   };
   key <AE10> {
-    symbols[Group1] = [0, parenright, rightsinglequotemark, dead_abovering, U2080, U2070],
-    symbols[Group2] = []
+    symbols[Group1] = [0, parenright, rightsinglequotemark, dead_abovering, U2080, U2070]
   };
   key <AE11> {
-    symbols[Group1] = [bracketleft, braceleft, guillemotleft, leftdoublequotemark],
-    symbols[Group2] = []
+    symbols[Group1] = [bracketleft, braceleft, guillemotleft, leftdoublequotemark]
   };
   key <AE12> {
-    symbols[Group1] = [bracketright, braceright, guillemotright, rightdoublequotemark],
-    symbols[Group2] = []
+    symbols[Group1] = [bracketright, braceright, guillemotright, rightdoublequotemark]
   };
 
   key <AD01> {
-    symbols[Group1] = [apostrophe, quotedbl, dead_acute, dead_diaeresis],
-    symbols[Group2] = []
+    symbols[Group1] = [apostrophe, quotedbl, dead_acute, dead_diaeresis]
   };
   key <AD02> {
-    symbols[Group1] = [comma, less, ccedilla, Ccedilla, leftanglebracket, U2227],
-    symbols[Group2] = [Pointer_Up, Pointer_Button4]
+    symbols[Group1] = [comma, less, ccedilla, Ccedilla, leftanglebracket, U2227]
   };
   key <AD03> {
-    symbols[Group1] = [period, greater, dead_abovedot, dead_caron, rightanglebracket, periodcentered, U2218, U2228],
-    symbols[Group2] = []
+    symbols[Group1] = [period, greater, dead_abovedot, dead_caron, rightanglebracket, periodcentered, U2218, U2228]
   };
   key <AD04> {
-    symbols[Group1] = [p, P, odiaeresis, Odiaeresis, Greek_pi, Greek_PI],
-    symbols[Group2] = []
+    symbols[Group1] = [p, P, odiaeresis, Odiaeresis, Greek_pi, Greek_PI]
   };
   key <AD05> {
-    symbols[Group1] = [y, Y, udiaeresis, Udiaeresis, Greek_upsilon, Greek_UPSILON],
-    symbols[Group2] = []
+    symbols[Group1] = [y, Y, udiaeresis, Udiaeresis, Greek_upsilon, Greek_UPSILON]
   };
 
   key <AD06> {
-    symbols[Group1] = [f, F, Greek_alpha, Greek_ALPHA, Greek_phi, Greek_PHI],
-    symbols[Group2] = []
+    symbols[Group1] = [f, F, Greek_alpha, Greek_ALPHA, Greek_phi, Greek_PHI]
   };
   key <AD07> {
-    symbols[Group1] = [g, G, Greek_epsilon, Greek_EPSILON, Greek_gamma, Greek_GAMMA],
-    symbols[Group2] = []
+    symbols[Group1] = [g, G, Greek_epsilon, Greek_EPSILON, Greek_gamma, Greek_GAMMA]
   };
   key <AD08> {
-    symbols[Group1] = [c, C, copyright, cent, Greek_psi, Greek_PSI],
-    symbols[Group2] = []
+    symbols[Group1] = [c, C, copyright, cent, Greek_psi, Greek_PSI]
   };
   key <AD09> {
-    symbols[Group1] = [r, R, registered, registered, Greek_rho, Greek_RHO],
-    symbols[Group2] = []
+    symbols[Group1] = [r, R, registered, registered, Greek_rho, Greek_RHO]
   };
   key <AD10> {
-    symbols[Group1] = [l, L, oslash, Ooblique, Greek_lambda, Greek_LAMBDA],
-    symbols[Group2] = [Right, Right, Pointer_Right]
+    symbols[Group1] = [l, L, oslash, Ooblique, Greek_lambda, Greek_LAMBDA]
   };
   key <AD11> {
-    symbols[Group1] = [slash, question, questiondown, dead_hook],
-    symbols[Group2] = []
+    symbols[Group1] = [slash, question, questiondown, dead_hook]
   };
   key <AD12> {
-    symbols[Group1] = [equal, plus, multiply, division, U2295, U2297, U229B, U29FA],
-    symbols[Group2] = []
+    symbols[Group1] = [equal, plus, multiply, division, U2295, U2297, U229B, U29FA]
   }; // = + × ÷ ⊕ ⊗ ⊛ ∅
 
   key <AC01> {
-    symbols[Group1] = [a, A, aacute, Aacute, Greek_alpha, Greek_ALPHA],
-    symbols[Group2] = [Pointer_Left]
+    symbols[Group1] = [a, A, aacute, Aacute, Greek_alpha, Greek_ALPHA]
   };
   key <AC02> {
-    symbols[Group1] = [o, O, oacute, Oacute, Greek_omicron, Greek_OMICRON, U01A1, U01A0],
-    symbols[Group2] = [Pointer_Down, Pointer_Button5]
+    symbols[Group1] = [o, O, oacute, Oacute, Greek_omicron, Greek_OMICRON, U01A1, U01A0]
   };
   key <AC03> {
-    symbols[Group1] = [e, E, eacute, Eacute, Greek_epsilon, Greek_EPSILON],
-    symbols[Group2] = [Right]
+    symbols[Group1] = [e, E, eacute, Eacute, Greek_epsilon, Greek_EPSILON]
   };
   key <AC04> {
-    symbols[Group1] = [u, U, uacute, Uacute, Greek_theta, Greek_THETA],
-    symbols[Group2] = [Prior, Prior, NoSymbol, NoSymbol, NoSymbol, NoSymbol]
+    symbols[Group1] = [u, U, uacute, Uacute, Greek_theta, Greek_THETA]
   };
   key <AC05> {
-    symbols[Group1] = [i, I, iacute, Iacute, Greek_iota, Greek_IOTA, U2208],
-    symbols[Group2] = [ISO_Next_Group, NoSymbol, NoSymbol, NoSymbol, NoSymbol, NoSymbol, NoSymbol, NoSymbol]
+    symbols[Group1] = [i, I, iacute, Iacute, Greek_iota, Greek_IOTA, U2208]
   };
   key <AC05> {
-    symbols[Group1] = [i, I, iacute, Iacute, Greek_iota, Greek_IOTA, U2208],
-    symbols[Group2] = [ISO_Previous_Group]
+    symbols[Group1] = [i, I, iacute, Iacute, Greek_iota, Greek_IOTA, U2208]
   };
   key <AC06> {
-    symbols[Group1] = [d, D, eth, ETH, Greek_delta, Greek_DELTA],
-    symbols[Group2] = [Next, Next, NoSymbol, NoSymbol, NoSymbol, NoSymbol]
+    symbols[Group1] = [d, D, eth, ETH, Greek_delta, Greek_DELTA]
   };
   key <AC07> {
-    symbols[Group1] = [h, H, Greek_lambda, Greek_LAMBDA, Greek_eta, Greek_ETA],
-    symbols[Group2] = [Left, Left, Pointer_Left]
+    symbols[Group1] = [h, H, Greek_lambda, Greek_LAMBDA, Greek_eta, Greek_ETA]
   };
   key <AC08> {
-    symbols[Group1] = [t, T, thorn, THORN, Greek_tau, Greek_TAU],
-    symbols[Group2] = []
+    symbols[Group1] = [t, T, thorn, THORN, Greek_tau, Greek_TAU]
   };
   key <AC09> {
-    symbols[Group1] = [n, N, ntilde, Ntilde, Greek_nu, Greek_NU, U2115],
-    symbols[Group2] = []
+    symbols[Group1] = [n, N, ntilde, Ntilde, Greek_nu, Greek_NU, U2115]
   };
   key <AC10> {
-    symbols[Group1] = [s, S, ssharp, section, Greek_sigma, Greek_SIGMA, U017f, integral],
-    symbols[Group2] = []
+    symbols[Group1] = [s, S, ssharp, section, Greek_sigma, Greek_SIGMA, U017f, integral]
   };
   key <AC11> {
-    symbols[Group1] = [minus, underscore, yen, dead_belowdot, U2500],
-    symbols[Group2] = []
+    symbols[Group1] = [minus, underscore, yen, dead_belowdot, U2500]
   };
 
   key <AB01> {
-    symbols[Group1] = [semicolon, colon, paragraph, degree, Multi_key],
-    symbols[Group2] = []
+    symbols[Group1] = [semicolon, colon, paragraph, degree, Multi_key]
   };
   key <AB02> {
-    symbols[Group1] = [q, Q, adiaeresis, Adiaeresis],
-    symbols[Group2] = []
+    symbols[Group1] = [q, Q, adiaeresis, Adiaeresis]
   };
   key <AB03> {
-    symbols[Group1] = [j, J, idiaeresis, Idiaeresis, Greek_xi, Greek_XI],
-    symbols[Group2] = [Down, Down, Pointer_Down]
+    symbols[Group1] = [j, J, idiaeresis, Idiaeresis, Greek_xi, Greek_XI]
   };
   key <AB04> {
-    symbols[Group1] = [k, K, oe, OE, Greek_kappa, Greek_KAPPA],
-    symbols[Group2] = [Up, Up, Pointer_Up]
+    symbols[Group1] = [k, K, oe, OE, Greek_kappa, Greek_KAPPA]
   };
   key <AB05> {
-    symbols[Group1] = [x, X, U2713, U2717, Greek_chi, Greek_CHI],
-    symbols[Group2] = [Delete]
+    symbols[Group1] = [x, X, U2713, U2717, Greek_chi, Greek_CHI]
   };
   key <AB06> {
-    symbols[Group1] = [b, B, Greek_beta, U2603, Greek_beta, Greek_BETA],
-    symbols[Group2] = []
+    symbols[Group1] = [b, B, Greek_beta, U2603, Greek_beta, Greek_BETA]
   };
   key <AB07> {
-    symbols[Group1] = [m, M, mu, mu, Greek_mu, Greek_MU],
-    symbols[Group2] = [NoSymbol]
+    symbols[Group1] = [m, M, mu, mu, Greek_mu, Greek_MU]
   };
   key <AB08> {
-    symbols[Group1] = [w, W, aring, Aring, Greek_finalsmallsigma],
-    symbols[Group2] = []
+    symbols[Group1] = [w, W, aring, Aring, Greek_finalsmallsigma]
   };
   key <AB09> {
-    symbols[Group1] = [v, V, U1F609, U1F620, Greek_omega, Greek_OMEGA],
-    symbols[Group2] = [NoSymbol]
+    symbols[Group1] = [v, V, U1F609, U1F620, Greek_omega, Greek_OMEGA]
   };
   key <AB10> {
-    symbols[Group1] = [z, Z, ae, AE, Greek_zeta, Greek_ZETA],
-    symbols[Group2] = []
+    symbols[Group1] = [z, Z, ae, AE, Greek_zeta, Greek_ZETA]
   };
 
   key <BKSL> {
-    symbols[Group1] = [backslash, bar, notsign, brokenbar, U2502],
-    symbols[Group2] = []
+    symbols[Group1] = [backslash, bar, notsign, brokenbar, U2502]
   };
   key <SPCE> {
-    symbols[Group1] = [space, space, U12001, U12002, U12003, U12004, U12005, U12006],
-    symbols[Group2] = [Pointer_Button1]
+    symbols[Group1] = [space, space, U12001, U12002, U12003, U12004, U12005, U12006]
   };
 
   key <DOWN> {
-    symbols[Group1] = [Down, U2193, U21D3],
-    symbols[Group2] = []
+    symbols[Group1] = [Down, U2193, U21D3]
   };
   key <UP> {
-    symbols[Group1] = [Up, U2191, U21D1],
-    symbols[Group2] = []
+    symbols[Group1] = [Up, U2191, U21D1]
   };
   key <LEFT> {
-    symbols[Group1] = [Left, U2190, U21D0],
-    symbols[Group2] = []
+    symbols[Group1] = [Left, U2190, U21D0]
   };
   key <RGHT> {
-    symbols[Group1] = [Right, U2192, U21D2],
-    symbols[Group2] = []
+    symbols[Group1] = [Right, U2192, U21D2]
   };
 
   // A random key none of my keyboards have. Map it to tab so I can use xcape.
   key <JPCM> {
-    symbols[Group1] = [Tab],
-    symbols[Group2] = []
+    symbols[Group1] = [Tab]
   };
 };
 
@@ -383,11 +318,10 @@ xkb_symbols "jdvprk" {
   include "jr(jdvp)"
 
   key <ESC> {
-    symbols[Group1] = [ dollar, asciitilde ] ,
-    symbols[Group2] = []
+    symbols[Group1] = [ dollar, asciitilde ] 
   };
 
   key <TLDE> {
-    symbols[Group1] = [ Escape ]
+    symbols[Group1] = [ dollar, asciitilde ]
   };
 };
-- 
cgit