Add g, remove custom keyboard layout

.config/sway/config

@@ -68,16 +68,14 @@ bindsym $mod+Pause exec swaylock -f --color 000000 --font "IBM Plex Sans" --imag
 # You can get the names of your inputs by running: swaymsg -t get_inputs
 # Read `man 5 sway-input` for more information about this section.
 input * {
-    xkb_layout "ambrose,us"
+    xkb_layout "us,us"
     xkb_variant "dvp,"
-    xkb_options "lv3:ralt_switch"
+    xkb_options "lv3:menu_switch,ctrl:nocaps,altwin:swap_lalt_lwin,compose:ralt"
     scroll_factor 1
 }
 # Switch keyboard layouts
-bindsym $mod+F9 input * xkb_switch_layout 0
+bindsym $mod+F9 input * xkb_switch_layout 0, input * xkb_options "lv3:menu_switch,ctrl:nocaps,altwin:swap_lalt_lwin,compose:ralt"
-bindsym $mod+F10 input * xkb_switch_layout 1
+bindsym $mod+F10 input * xkb_switch_layout 1, input * xkb_options "lv3:menu_switch,compose:ralt"
-bindsym $mod+F11 input * xkb_switch_layout 2
-bindsym $mod+F12 input * xkb_switch_layout 2
 
 input type:touchpad {
     natural_scroll enabled

.dockerignore

@@ -4,6 +4,8 @@
 .*_history
 .android
 .ansible
+.arduino*/*
+!.arduino*/preferences.txt
 .audacity*
 .bash*
 .cache
@@ -40,6 +42,7 @@
 .gnupg/*
 !.gnupg/gpg-agent.conf
 !.gnupg/gpg.conf
+.go
 .java
 .kube/cache
 .lesshst
@@ -58,6 +61,7 @@
 .local/share/yadm/repo.git
 !.local/share/yadm/archive
 .local/state
+.local/zephyr*
 .mc/share
 .mozilla/*
 !.mozilla/firefox
@@ -66,6 +70,7 @@
 .npm
 .password-store
 .pki
+.pm2
 !.pwn
 .rustup/toolchains
 .rustup/update-hashes

.github/README.md

@@ -37,40 +37,3 @@ yadm clone git@github.com:serverwentdown/env.git
 ```sh
 git clone git@makerforce.io:ambrose/pass.git ~/.password-store
 ```
-
-### GNOME Keyboard
-
-First, copy the custom layout:
-
-```
-cp ~/.xkb/symbols/ambrose /usr/share/X11/xkb/symbols/ambrose
-```
-
-Then, open `/usr/share/X11/xkb/rules/evdev.xml` in an editor and add this block in `<layoutList>`:
-
-```
-    <layout>
-      <configItem>
-        <name>ambrose</name>
-        <shortDescription>amb</shortDescription>
-        <description>English (Ambrose)</description>
-        <languageList>
-          <iso639Id>eng</iso639Id>
-        </languageList>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>dvp</name>
-            <description>English (Ambrose, Programmer Dvorak)</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>basic</name>
-            <description>English (Ambrose, Qwerty)</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-```

.gitignore

@@ -4,6 +4,8 @@
 .*_history
 .android
 .ansible
+.arduino*/*
+!.arduino*/preferences.txt
 .audacity*
 .bash*
 .cache
@@ -40,6 +42,7 @@
 .gnupg/*
 !.gnupg/gpg-agent.conf
 !.gnupg/gpg.conf
+.go
 .java
 .kube/cache
 .lesshst
@@ -58,6 +61,7 @@
 .local/share/yadm/repo.git
 !.local/share/yadm/archive
 .local/state
+.local/zephyr*
 .mc/share
 .mozilla/*
 !.mozilla/firefox
@@ -66,6 +70,7 @@
 .npm
 .password-store
 .pki
+.pm2
 !.pwn
 .rustup/toolchains
 .rustup/update-hashes

.xkb/symbols/ambrose

@@ -1,37 +0,0 @@
-hidden partial modifier_keys
-xkb_symbols "lctrl_escape" {
-    key <LCTL> { [ Escape ] };
-};
-
-hidden partial modifier_keys
-xkb_symbols "caps_lctrl" {
-    replace key <CAPS> { [ Control_L, Control_L ] };
-    modifier_map  Control { <CAPS>, <LCTL> };
-};
-
-hidden partial modifier_keys
-xkb_symbols "swap_lalt_lwin" {
-    key <LALT> { type[Group1] = "ONE_LEVEL",
-                 symbols[Group1] = [ Super_L ] };
-    key <LWIN> { [ Alt_L, Meta_L ] };
-};
-
-partial alphanumeric_keys
-xkb_symbols "basic" {
-    include "us(basic)"
-    name[Group1]= "English (Ambrose, Qwerty)";
-
-    include "ambrose(lctrl_escape)"
-    include "ambrose(caps_lctrl)"
-    include "ambrose(swap_lalt_lwin)"
-};
-
-default partial alphanumeric_keys
-xkb_symbols "dvp" {
-    include "us(dvp)"
-    name[Group1]= "English (Ambrose, Programmer Dvorak)";
-
-    include "ambrose(lctrl_escape)"
-    include "ambrose(caps_lctrl)"
-    include "ambrose(swap_lalt_lwin)"
-};

.zshrc

@@ -75,6 +75,9 @@ fi
 if [[ -f "$(which go 2>/dev/null)" ]]; then
 	export PATH="$(go env GOPATH)/bin:$PATH"
 fi
+if [[ -f "$HOME/go/bin/g" ]]; then
+	export PATH="$HOME/go/bin:$PATH" GOPATH="$HOME/go" GOROOT="$HOME/.go" # g-install: do NOT edit, see https://github.com/stefanmaric/g
+fi
 if [[ -d "$HOME/.cargo" ]]; then
 	export PATH="$HOME/.cargo/bin:$PATH"
 fi
@@ -493,4 +496,3 @@ if [[ -f "$(which gpgconf 2>/dev/null)" ]]; then
 		echo UPDATESTARTUPTTY | gpg-connect-agent >/dev/null 2>&1
 	}
 fi
-