summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <programble@gmail.com>2017-06-10 17:06:37 -0400
committerJune McEnroe <programble@gmail.com>2017-06-10 17:06:37 -0400
commit11064d2fc6b8519b043d6ada1d57c915646482b4 (patch)
tree6216f3824f625cc1e95dc55c12dc34fb443e0bc0
parentMove actual dotfiles into curtis directory (diff)
downloadsrc-11064d2fc6b8519b043d6ada1d57c915646482b4.tar.gz
src-11064d2fc6b8519b043d6ada1d57c915646482b4.zip
Remove Karabiner config and move key layouts
Custom layouts allow me to drop Karabiner, which is necessary since it
still doesn't work on Sierra.

Moved the keylayout files to be just files since installing them with
symlinks doesn't work very well, they need to be installed with Ukelele.
I should find out what it does though.
-rw-r--r--Library/Application Support/Karabiner/private.xml203
-rwxr-xr-xinstall.sh9
-rw-r--r--keys/CodeTarmak1.keylayout (renamed from Library/Keyboard Layouts/CodeTarmak1.keylayout)0
-rw-r--r--keys/Tarmak1.keylayout (renamed from Library/Keyboard Layouts/Tarmak 1.keylayout)0
-rw-r--r--keys/Tarmak2.keylayout (renamed from Library/Keyboard Layouts/Tarmak 2.keylayout)0
-rw-r--r--keys/Tarmak3.keylayout (renamed from Library/Keyboard Layouts/Tarmak 3.keylayout)0
-rw-r--r--keys/Tarmak4.keylayout (renamed from Library/Keyboard Layouts/Tarmak 4.keylayout)0
-rw-r--r--keys/code.map (renamed from custom.map)0
8 files changed, 0 insertions, 212 deletions
diff --git a/Library/Application Support/Karabiner/private.xml b/Library/Application Support/Karabiner/private.xml
deleted file mode 100644
index 1d6e8194..00000000
--- a/Library/Application Support/Karabiner/private.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0"?>
-<root>
-    <item>
-        <name>Inverted shift</name>
-        <identifier>private.inverted_shift</identifier>
-
-        <modifier_not>
-            ModifierFlag::COMMAND_L,
-            ModifierFlag::COMMAND_R,
-            ModifierFlag::CONTROL_L,
-            ModifierFlag::CONTROL_R,
-            ModifierFlag::OPTION_L,
-            ModifierFlag::OPTION_R,
-            ModifierFlag::FN,
-        </modifier_not>
-
-        <appendix>Swap minus and underscore</appendix>
-
-        <autogen>
-            __KeyToKey__
-            KeyCode::MINUS, ModifierFlag::NONE,
-            KeyCode::MINUS, ModifierFlag::SHIFT_L
-        </autogen>
-        <autogen>
-            __KeyToKey__
-            KeyCode::MINUS, MODIFIERFLAG_EITHER_LEFT_OR_RIGHT_SHIFT,
-            KeyCode::MINUS
-        </autogen>
-
-        <appendix>Swap backslash and pipe</appendix>
-
-        <autogen>
-            __KeyToKey__
-            KeyCode::BACKSLASH, ModifierFlag::NONE,
-            KeyCode::BACKSLASH, ModifierFlag::SHIFT_L
-        </autogen>
-        <autogen>
-            __KeyToKey__
-            KeyCode::BACKSLASH, MODIFIERFLAG_EITHER_LEFT_OR_RIGHT_SHIFT,
-            KeyCode::BACKSLASH
-        </autogen>
-
-        <appendix>Swap square brackets and braces</appendix>
-
-        <autogen>
-            __KeyToKey__
-            KeyCode::BRACKET_LEFT, ModifierFlag::NONE,
-            KeyCode::BRACKET_LEFT, ModifierFlag::SHIFT_L
-        </autogen>
-        <autogen>
-            __KeyToKey__
-            KeyCode::BRACKET_LEFT, MODIFIERFLAG_EITHER_LEFT_OR_RIGHT_SHIFT,
-            KeyCode::BRACKET_LEFT
-        </autogen>
-        <autogen>
-            __KeyToKey__
-            KeyCode::BRACKET_RIGHT, ModifierFlag::NONE,
-            KeyCode::BRACKET_RIGHT, ModifierFlag::SHIFT_L
-        </autogen>
-        <autogen>
-            __KeyToKey__
-            KeyCode::BRACKET_RIGHT, MODIFIERFLAG_EITHER_LEFT_OR_RIGHT_SHIFT,
-            KeyCode::BRACKET_RIGHT
-        </autogen>
-
-        <appendix>Swap numbers and symbols</appendix>
-
-        <autogen>
-            __KeyToKey__
-            KeyCode::KEY_1, MODIFIERFLAG_EITHER_LEFT_OR_RIGHT_SHIFT,
-            KeyCode::KEY_1
-        </autogen>
-        <autogen>
-            __KeyToKey__
-            KeyCode::KEY_2, MODIFIERFLAG_EITHER_LEFT_OR_RIGHT_SHIFT,
-            KeyCode::KEY_2
-        </autogen>
-        <autogen>
-            __KeyToKey__
-            KeyCode::KEY_3, MODIFIERFLAG_EITHER_LEFT_OR_RIGHT_SHIFT,
-            KeyCode::KEY_3
-        </autogen>
-        <autogen>
-            __KeyToKey__
-            KeyCode::KEY_4, MODIFIERFLAG_EITHER_LEFT_OR_RIGHT_SHIFT,
-            KeyCode::KEY_4
-        </autogen>
-        <autogen>
-            __KeyToKey__
-            KeyCode::KEY_5, MODIFIERFLAG_EITHER_LEFT_OR_RIGHT_SHIFT,
-            KeyCode::KEY_5
-        </autogen>
-        <autogen>
-            __KeyToKey__
-            KeyCode::KEY_6, MODIFIERFLAG_EITHER_LEFT_OR_RIGHT_SHIFT,
-            KeyCode::KEY_6
-        </autogen>
-        <autogen>
-            __KeyToKey__
-            KeyCode::KEY_7, MODIFIERFLAG_EITHER_LEFT_OR_RIGHT_SHIFT,
-            KeyCode::KEY_7
-        </autogen>
-        <autogen>
-            __KeyToKey__
-            KeyCode::KEY_8, MODIFIERFLAG_EITHER_LEFT_OR_RIGHT_SHIFT,
-            KeyCode::KEY_8
-        </autogen>
-        <autogen>
-            __KeyToKey__
-            KeyCode::KEY_9, MODIFIERFLAG_EITHER_LEFT_OR_RIGHT_SHIFT,
-            KeyCode::KEY_9
-        </autogen>
-        <autogen>
-            __KeyToKey__
-            KeyCode::KEY_0, MODIFIERFLAG_EITHER_LEFT_OR_RIGHT_SHIFT,
-            KeyCode::KEY_0
-        </autogen>
-        <autogen>
-            __KeyToKey__
-            KeyCode::KEY_1,
-            KeyCode::KEY_1, ModifierFlag::SHIFT_L
-        </autogen>
-        <autogen>
-            __KeyToKey__
-            KeyCode::KEY_2,
-            KeyCode::KEY_2, ModifierFlag::SHIFT_L
-        </autogen>
-        <autogen>
-            __KeyToKey__
-            KeyCode::KEY_3,
-            KeyCode::KEY_3, ModifierFlag::SHIFT_L
-        </autogen>
-        <autogen>
-            __KeyToKey__
-            KeyCode::KEY_4,
-            KeyCode::KEY_4, ModifierFlag::SHIFT_L
-        </autogen>
-        <autogen>
-            __KeyToKey__
-            KeyCode::KEY_5,
-            KeyCode::KEY_5, ModifierFlag::SHIFT_L
-        </autogen>
-        <autogen>
-            __KeyToKey__
-            KeyCode::KEY_6,
-            KeyCode::KEY_6, ModifierFlag::SHIFT_L
-        </autogen>
-        <autogen>
-            __KeyToKey__
-            KeyCode::KEY_7,
-            KeyCode::KEY_7, ModifierFlag::SHIFT_L
-        </autogen>
-        <autogen>
-            __KeyToKey__
-            KeyCode::KEY_8,
-            KeyCode::KEY_8, ModifierFlag::SHIFT_L
-        </autogen>
-        <autogen>
-            __KeyToKey__
-            KeyCode::KEY_9,
-            KeyCode::KEY_9, ModifierFlag::SHIFT_L
-        </autogen>
-        <autogen>
-            __KeyToKey__
-            KeyCode::KEY_0,
-            KeyCode::KEY_0, ModifierFlag::SHIFT_L
-        </autogen>
-    </item>
-
-    <devicevendordef>
-        <vendorname>LEOPOLD</vendorname>
-        <vendorid>0x0853</vendorid>
-    </devicevendordef>
-
-    <deviceproductdef>
-        <productname>FC660C</productname>
-        <productid>0x0134</productid>
-    </deviceproductdef>
-
-    <item>
-        <name>Leopold media control</name>
-        <identifier>private.leopold_media_control</identifier>
-        <device_only>DeviceVendor::LEOPOLD, DeviceProduct::FC660C</device_only>
-
-        <appendix>Bind ctrl help and delete to volume control</appendix>
-
-        <autogen>
-            __KeyToKey__
-            KeyCode::HELP, ModifierFlag::CONTROL_R,
-            ConsumerKeyCode::VOLUME_UP
-        </autogen>
-        <autogen>
-            __KeyToKey__
-            KeyCode::FORWARD_DELETE, ModifierFlag::CONTROL_R,
-            ConsumerKeyCode::VOLUME_DOWN
-        </autogen>
-
-        <appendix>Bind help and delete to music play and next</appendix>
-
-        <autogen>__KeyToKey__ KeyCode::HELP, ConsumerKeyCode::MUSIC_PLAY</autogen>
-        <autogen>__KeyToKey__ KeyCode::FORWARD_DELETE, ConsumerKeyCode::MUSIC_NEXT</autogen>
-    </item>
-</root>
diff --git a/install.sh b/install.sh
index 4e0b7e5d..f3bb91c4 100755
--- a/install.sh
+++ b/install.sh
@@ -21,15 +21,6 @@ link() {
   echo "$1"
 }
 
-#if [ -d ~/Library ]; then
-#  link 'Library/Application Support/Karabiner/private.xml'
-#  link 'Library/Keyboard Layouts/CodeTarmak1.keylayout'
-#  link 'Library/Keyboard Layouts/Tarmak 1.keylayout'
-#  link 'Library/Keyboard Layouts/Tarmak 2.keylayout'
-#  link 'Library/Keyboard Layouts/Tarmak 3.keylayout'
-#  link 'Library/Keyboard Layouts/Tarmak 4.keylayout'
-#fi
-
 link '.bin/bri.c'
 link '.bin/clock.c'
 link '.bin/jrp.c'
diff --git a/Library/Keyboard Layouts/CodeTarmak1.keylayout b/keys/CodeTarmak1.keylayout
index ef3bce15..ef3bce15 100644
--- a/Library/Keyboard Layouts/CodeTarmak1.keylayout
+++ b/keys/CodeTarmak1.keylayout
diff --git a/Library/Keyboard Layouts/Tarmak 1.keylayout b/keys/Tarmak1.keylayout
index feed94f7..feed94f7 100644
--- a/Library/Keyboard Layouts/Tarmak 1.keylayout
+++ b/keys/Tarmak1.keylayout
diff --git a/Library/Keyboard Layouts/Tarmak 2.keylayout b/keys/Tarmak2.keylayout
index 4135e480..4135e480 100644
--- a/Library/Keyboard Layouts/Tarmak 2.keylayout
+++ b/keys/Tarmak2.keylayout
diff --git a/Library/Keyboard Layouts/Tarmak 3.keylayout b/keys/Tarmak3.keylayout
index 70ca89c4..70ca89c4 100644
--- a/Library/Keyboard Layouts/Tarmak 3.keylayout
+++ b/keys/Tarmak3.keylayout
diff --git a/Library/Keyboard Layouts/Tarmak 4.keylayout b/keys/Tarmak4.keylayout
index 6c16cae3..6c16cae3 100644
--- a/Library/Keyboard Layouts/Tarmak 4.keylayout
+++ b/keys/Tarmak4.keylayout
diff --git a/custom.map b/keys/code.map
index de0b4064..de0b4064 100644
--- a/custom.map
+++ b/keys/code.map