diff --git a/install/linux/x_keyboard_extension/Makefile b/install/linux/x_keyboard_extension/Makefile index be3070b..e50dcf7 100644 --- a/install/linux/x_keyboard_extension/Makefile +++ b/install/linux/x_keyboard_extension/Makefile @@ -1,18 +1,17 @@ -TARGET_SYM := /usr/share/X11/xkb/symbols/us +XKB_BASE := /usr/share/X11/xkb +TARGET_SYM := $(XKB_BASE)/symbols/us +TARGET_RULE := $(XKB_BASE)/rules/evdev.xml SOURCE_SYM := usr-share-X11-xkb-symbols-us -TARGET_RULE := /usr/share/X11/xkb/rules/evdev.xml SOURCE_RULE := usr-share-X11-xkb-rules-evdev all: reinstall install: $(SOURCE_SYM) $(TARGET_SYM) $(SOURCE_RULE) $(TARGET_RULE) - echo '//ENGRAM//BEGIN' >> $(TARGET_SYM) cat $(SOURCE_SYM) >> $(TARGET_SYM) - echo '//ENGRAM//END' >> $(TARGET_SYM) - sed -i "$$(awk '/variantList/ {print NR; exit}' $(TARGET_RULE)) r $(SOURCE_RULE)" $(TARGET_RULE) + sed -i '/English (US)/,//!b ; //r $(SOURCE_RULE)' $(TARGET_RULE) uninstall: $(TARGET_SYM) $(TARGET_RULE) - sed -i '/^\/\/ENGRAM\/\/BEGIN$$/,/^\/\/ENGRAM\/\/END$$/d' $(TARGET_SYM) + sed -i '/^\/\/ENGRAM BEGIN$$/,/^\/\/ENGRAM END$$/d' $(TARGET_SYM) sed -i '/ENGRAM BEGIN/,/ENGRAM END/d' $(TARGET_RULE) reinstall: diff --git a/install/linux/x_keyboard_extension/usr-share-X11-xkb-symbols-us b/install/linux/x_keyboard_extension/usr-share-X11-xkb-symbols-us index 8a0f2ef..9300c56 100644 --- a/install/linux/x_keyboard_extension/usr-share-X11-xkb-symbols-us +++ b/install/linux/x_keyboard_extension/usr-share-X11-xkb-symbols-us @@ -1,8 +1,9 @@ +//ENGRAM BEGIN // Arno's Engram keyboard layout v2.0 - https://engram.dev -partial alphanumeric_keys +partial alphanumeric_keys modifier_keys xkb_symbols "engram" { - include "us(basic)" + name[Group1]="English (Engram)"; key { [ bracketleft, braceleft ] }; // [{ key { [ 1, bar ] }; // 1| @@ -55,3 +56,4 @@ xkb_symbols "engram" key { [ f, F ] }; // fF key { [ p, P ] }; // pP }; +//ENGRAM END \ No newline at end of file