# HG changeset patch # User Steve Losh # Date 1557353767 14400 # Node ID a92fa44e6833545d391b32a3611e8fdeccd0f5a2 # Parent 1d918d0a302690477e54b840585ad31a8f5985f7# Parent 0ababcc7c2a604f3dd3fb3ed156b9d3de0f769c3 Merge. diff -r 1d918d0a3026 -r a92fa44e6833 .hgsub --- a/.hgsub Wed May 08 18:15:34 2019 -0400 +++ b/.hgsub Wed May 08 18:16:07 2019 -0400 @@ -3,6 +3,7 @@ vim/bundle/abolish = [git]https://github.com/tpope/vim-abolish vim/bundle/ack = [git]https://github.com/mileszs/ack.vim vim/bundle/badwolf = [hg]ssh://hg@hg.sr.ht/~sjl/badwolf/ +vim/bundle/boxdraw = [git]https://github.com/gyim/vim-boxdraw vim/bundle/clam = [hg]ssh://hg@hg.sr.ht/~sjl/clam.vim/ vim/bundle/commentary = [git]https://github.com/tpope/vim-commentary vim/bundle/ctrlp = [git]https://github.com/ctrlpvim/ctrlp.vim diff -r 1d918d0a3026 -r a92fa44e6833 .hgsubstate --- a/.hgsubstate Wed May 08 18:15:34 2019 -0400 +++ b/.hgsubstate Wed May 08 18:16:07 2019 -0400 @@ -3,6 +3,7 @@ b6a8b49e2173ba5a1b34d00e68e0ed8addac3ebd vim/bundle/abolish a16a9b63eb85cc0960a7f25c54647ac1f99f3360 vim/bundle/ack d0bec1e6ea5d4a036cbbb8693a94583b91778ecc vim/bundle/badwolf +24f6d94dd03ba0fdc703265fe281f70cf2b45ba6 vim/bundle/boxdraw b542a7bc4d9bc5da8fb12e110fe7975131fb57a4 vim/bundle/clam 8295187ea1210138c0b171d8e3ec3569936f4c1a vim/bundle/commentary c6d1fc5e58d689bfb104ff336aeb89d9ef1b48e2 vim/bundle/ctrlp diff -r 1d918d0a3026 -r a92fa44e6833 mutt/muttrc --- a/mutt/muttrc Wed May 08 18:15:34 2019 -0400 +++ b/mutt/muttrc Wed May 08 18:16:07 2019 -0400 @@ -171,6 +171,7 @@ bind index collapse-thread bind index N search-opposite bind index sort-mailbox +bind index B sidebar-toggle-visible # macro index s "cat > ~/Desktop/" "save message as" # Mark all as read diff -r 1d918d0a3026 -r a92fa44e6833 stumpwmrc --- a/stumpwmrc Wed May 08 18:15:34 2019 -0400 +++ b/stumpwmrc Wed May 08 18:16:07 2019 -0400 @@ -310,7 +310,7 @@ (define-top-keys ;; application shortcuts - ("H-m" "exec st -f 'Ubuntu Mono:size=11:antialias=true:autohint=true'") + ("H-m" "exec st") ("H-SunPageUp" "st-font-up") ("H-SunPageDown" "st-font-down") ("H-Home" "st-font-reset") diff -r 1d918d0a3026 -r a92fa44e6833 uhk.json --- a/uhk.json Wed May 08 18:15:34 2019 -0400 +++ b/uhk.json Wed May 08 18:16:07 2019 -0400 @@ -5,7 +5,7 @@ "deviceName": "My UHK", "doubleTapSwitchLayerTimeout": 250, "iconsAndLayerTextsBrightness": 35, - "alphanumericSegmentsBrightness": 10, + "alphanumericSegmentsBrightness": 31, "keyBacklightBrightness": 0, "mouseMoveInitialSpeed": 8, "mouseMoveAcceleration": 128, @@ -565,7 +565,10 @@ "type": "basic", "scancode": 63 }, - null, + { + "keyActionType": "switchKeymap", + "keymapAbbreviation": "DVO" + }, { "keyActionType": "keystroke", "type": "basic", @@ -839,10 +842,7 @@ null, null, null, - { - "keyActionType": "switchKeymap", - "keymapAbbreviation": "TES" - }, + null, { "keyActionType": "mouse", "mouseAction": "scrollLeft" @@ -1550,7 +1550,10 @@ "type": "basic", "scancode": 63 }, - null, + { + "keyActionType": "switchKeymap", + "keymapAbbreviation": "COM" + }, { "keyActionType": "keystroke", "type": "basic", @@ -1833,10 +1836,7 @@ null, null, null, - { - "keyActionType": "switchKeymap", - "keymapAbbreviation": "TES" - }, + null, { "keyActionType": "mouse", "mouseAction": "scrollLeft" @@ -2544,7 +2544,10 @@ "type": "basic", "scancode": 63 }, - null, + { + "keyActionType": "switchKeymap", + "keymapAbbreviation": "QWR" + }, { "keyActionType": "keystroke", "type": "basic", @@ -3526,7 +3529,10 @@ "type": "basic", "scancode": 63 }, - null, + { + "keyActionType": "switchKeymap", + "keymapAbbreviation": "DVM" + }, { "keyActionType": "keystroke", "type": "basic", @@ -4517,7 +4523,10 @@ "type": "basic", "scancode": 63 }, - null, + { + "keyActionType": "switchKeymap", + "keymapAbbreviation": "SJL" + }, { "keyActionType": "keystroke", "type": "basic", @@ -5493,7 +5502,10 @@ "type": "basic", "scancode": 63 }, - null, + { + "keyActionType": "switchKeymap", + "keymapAbbreviation": "QWM" + }, { "keyActionType": "keystroke", "type": "basic", @@ -5609,10 +5621,7 @@ null, null, null, - { - "keyActionType": "switchKeymap", - "keymapAbbreviation": "TES" - }, + null, { "keyActionType": "keystroke", "type": "media", @@ -6481,7 +6490,10 @@ "type": "basic", "scancode": 63 }, - null, + { + "keyActionType": "switchKeymap", + "keymapAbbreviation": "COL" + }, { "keyActionType": "keystroke", "type": "basic", @@ -6970,974 +6982,6 @@ ] } ] - }, - { - "isDefault": false, - "abbreviation": "TES", - "name": "Test", - "description": "This keymap is only used for factory testing purposes.", - "layers": [ - { - "modules": [ - { - "id": 0, - "keyActions": [ - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 36 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 37 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 38 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 39 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 45 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 46 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 42 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 24 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 12 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 18 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 19 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 47 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 48 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 49 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 28 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 13 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 14 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 15 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 51 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 52 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 87 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 11 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 17 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 16 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 54 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 55 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 56 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "modifierMask": 32 - }, - null, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 94 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 85 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 95 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 96 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 97 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 98 - } - ] - }, - { - "id": 1, - "keyActions": [ - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 53 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 30 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 31 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 32 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 33 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 34 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 35 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 41 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 20 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 26 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 8 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 21 - }, - null, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 23 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 86 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 4 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 22 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 7 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 9 - }, - null, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 10 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "modifierMask": 2 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 100 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 29 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 27 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 6 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 25 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 5 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 89 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 90 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 91 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 92 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 84 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 93 - }, - null - ] - }, - { - "id": 2, - "keyActions": [] - } - ] - }, - { - "modules": [ - { - "id": 0, - "keyActions": [ - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 64 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 65 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 66 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 67 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 68 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 69 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 76 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 74 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 82 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 77 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 76 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 70 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 71 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 72 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 75 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 80 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 81 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 79 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 73 - }, - null, - null, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 78 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 41 - }, - null, - null, - null, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 101 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "modifierMask": 32 - }, - null, - null, - null, - null, - { - "keyActionType": "keystroke", - "type": "basic", - "modifierMask": 64 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "modifierMask": 128 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "modifierMask": 16 - } - ] - }, - { - "id": 1, - "keyActions": [ - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 41 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 58 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 59 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 60 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 61 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 62 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 63 - }, - null, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 41 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 75, - "modifierMask": 1 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 23, - "modifierMask": 1 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 78, - "modifierMask": 1 - }, - null, - null, - null, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 57 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 80, - "modifierMask": 5 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 43, - "modifierMask": 4 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 79, - "modifierMask": 5 - }, - null, - null, - { - "keyActionType": "keystroke", - "type": "basic", - "modifierMask": 2 - }, - null, - null, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 75, - "modifierMask": 3 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 26, - "modifierMask": 1 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "scancode": 78, - "modifierMask": 3 - }, - null, - { - "keyActionType": "keystroke", - "type": "basic", - "modifierMask": 1 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "modifierMask": 8 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "modifierMask": 4 - }, - null, - null, - null, - null - ] - } - ] - }, - { - "modules": [ - { - "id": 0, - "keyActions": [ - null, - null, - null, - null, - null, - null, - null, - { - "keyActionType": "keystroke", - "type": "media", - "scancode": 205 - }, - { - "keyActionType": "keystroke", - "type": "media", - "scancode": 233 - }, - null, - null, - null, - null, - { - "keyActionType": "keystroke", - "type": "system", - "scancode": 130 - }, - null, - { - "keyActionType": "keystroke", - "type": "media", - "scancode": 182 - }, - { - "keyActionType": "keystroke", - "type": "media", - "scancode": 234 - }, - { - "keyActionType": "keystroke", - "type": "media", - "scancode": 181 - }, - null, - null, - null, - null, - null, - null, - { - "keyActionType": "keystroke", - "type": "media", - "scancode": 226 - }, - null, - null, - { - "keyActionType": "keystroke", - "type": "basic", - "modifierMask": 32 - }, - null, - null, - null, - null, - { - "keyActionType": "keystroke", - "type": "basic", - "modifierMask": 64 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "modifierMask": 128 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "modifierMask": 16 - } - ] - }, - { - "id": 1, - "keyActions": [ - null, - { - "keyActionType": "switchKeymap", - "keymapAbbreviation": "QWR" - }, - { - "keyActionType": "switchKeymap", - "keymapAbbreviation": "DVO" - }, - { - "keyActionType": "switchKeymap", - "keymapAbbreviation": "COL" - }, - { - "keyActionType": "switchKeymap", - "keymapAbbreviation": "QWM" - }, - { - "keyActionType": "switchKeymap", - "keymapAbbreviation": "DVM" - }, - { - "keyActionType": "switchKeymap", - "keymapAbbreviation": "COM" - }, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - { - "keyActionType": "keystroke", - "type": "basic", - "modifierMask": 2 - }, - null, - null, - null, - null, - null, - null, - { - "keyActionType": "keystroke", - "type": "basic", - "modifierMask": 1 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "modifierMask": 8 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "modifierMask": 4 - }, - null, - null, - null, - null - ] - } - ] - }, - { - "modules": [ - { - "id": 0, - "keyActions": [ - null, - null, - null, - null, - null, - null, - null, - { - "keyActionType": "mouse", - "mouseAction": "scrollLeft" - }, - { - "keyActionType": "mouse", - "mouseAction": "moveUp" - }, - { - "keyActionType": "mouse", - "mouseAction": "scrollRight" - }, - null, - null, - null, - null, - { - "keyActionType": "mouse", - "mouseAction": "scrollUp" - }, - { - "keyActionType": "mouse", - "mouseAction": "moveLeft" - }, - { - "keyActionType": "mouse", - "mouseAction": "moveDown" - }, - { - "keyActionType": "mouse", - "mouseAction": "moveRight" - }, - null, - null, - null, - { - "keyActionType": "mouse", - "mouseAction": "scrollDown" - }, - null, - null, - null, - null, - null, - { - "keyActionType": "keystroke", - "type": "basic", - "modifierMask": 32 - }, - null, - { - "keyActionType": "mouse", - "mouseAction": "leftClick" - }, - { - "keyActionType": "mouse", - "mouseAction": "rightClick" - }, - null, - { - "keyActionType": "keystroke", - "type": "basic", - "modifierMask": 64 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "modifierMask": 128 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "modifierMask": 16 - } - ] - }, - { - "id": 1, - "keyActions": [ - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - { - "keyActionType": "mouse", - "mouseAction": "rightClick" - }, - { - "keyActionType": "mouse", - "mouseAction": "middleClick" - }, - { - "keyActionType": "mouse", - "mouseAction": "leftClick" - }, - null, - null, - { - "keyActionType": "keystroke", - "type": "basic", - "modifierMask": 2 - }, - null, - null, - null, - null, - null, - null, - { - "keyActionType": "keystroke", - "type": "basic", - "modifierMask": 1 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "modifierMask": 8 - }, - { - "keyActionType": "keystroke", - "type": "basic", - "modifierMask": 4 - }, - null, - { - "keyActionType": "mouse", - "mouseAction": "decelerate" - }, - { - "keyActionType": "mouse", - "mouseAction": "accelerate" - }, - null - ] - } - ] - } - ] } ], "macros": [ diff -r 1d918d0a3026 -r a92fa44e6833 vim/custom-dictionary.utf-8.add --- a/vim/custom-dictionary.utf-8.add Wed May 08 18:15:34 2019 -0400 +++ b/vim/custom-dictionary.utf-8.add Wed May 08 18:16:07 2019 -0400 @@ -282,3 +282,4 @@ subshell schemaless virtualization +rebasing