From 3389c512e2d0f7f7bc3c7bed161aed6820758506 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Wed, 1 Apr 2020 02:08:47 -0500 Subject: [PATCH 01/28] - Updated readme to include debug mode --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index 4ccba4b..ba609f9 100644 --- a/README.md +++ b/README.md @@ -481,6 +481,16 @@ cd ~/.config/kinto ./kintox11 ``` +## Debug + +If all else fails you can now run Kinto in debug mode as of 1.0.6-2. The output will become more verbose and I'd recommend running this directly after stopping the service. + +``` +systemctl --user stop keyswap +cd ~/.config/kinto +./kintox11 --debug +``` + ## Language Support I'd appreciate any help from people with non-US based keyboards, to help ensure that these keymaps and keyswap methods work in all or most languages. From d670579db8d0a3810b584eeb81112a3b715765b7 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Wed, 1 Apr 2020 02:21:03 -0500 Subject: [PATCH 02/28] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 32 ++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000..c10b476 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,32 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '' +labels: bug +assignees: rbreaves + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Install Type:** Bare Metal or VM +**Distro:** Name + Version +**DE:** Gnome, XFCE, KDE +**Branch:** master, dev +**Commit:** git rev-parse --short HEAD + +If applicable include kinto log and the status of your input caret +``` +cat /tmp/kinto/caret +journalctl --user-unit=keyswap.service -b +``` + +**Additional context** +Add any other context about the problem here. From d7433092ffa8b323cae117c75be2644e6c09e78c Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Wed, 1 Apr 2020 02:25:29 -0500 Subject: [PATCH 03/28] Update issue templates --- .github/ISSUE_TEMPLATE/feature_request.md | 20 ++++++++++++++++++++ .github/ISSUE_TEMPLATE/gratitude.md | 10 ++++++++++ .github/ISSUE_TEMPLATE/question.md | 10 ++++++++++ 3 files changed, 40 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md create mode 100644 .github/ISSUE_TEMPLATE/gratitude.md create mode 100644 .github/ISSUE_TEMPLATE/question.md diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 0000000..376557a --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,20 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '' +labels: enhancement +assignees: rbreaves + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. diff --git a/.github/ISSUE_TEMPLATE/gratitude.md b/.github/ISSUE_TEMPLATE/gratitude.md new file mode 100644 index 0000000..d0ad607 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/gratitude.md @@ -0,0 +1,10 @@ +--- +name: Gratitude +about: Just wants to give a shout out! +title: '' +labels: gratitude +assignees: rbreaves + +--- + + diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md new file mode 100644 index 0000000..399371a --- /dev/null +++ b/.github/ISSUE_TEMPLATE/question.md @@ -0,0 +1,10 @@ +--- +name: Question +about: Question about Kinto functionality +title: '' +labels: question +assignees: rbreaves + +--- + + From 6a887ebdeab1610d7809f9a138485184b5d6fe77 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Wed, 1 Apr 2020 02:27:53 -0500 Subject: [PATCH 04/28] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index c10b476..4bae2d4 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -7,15 +7,6 @@ assignees: rbreaves --- -**Describe the bug** -A clear and concise description of what the bug is. - -**Expected behavior** -A clear and concise description of what you expected to happen. - -**Screenshots** -If applicable, add screenshots to help explain your problem. - **Install Type:** Bare Metal or VM **Distro:** Name + Version **DE:** Gnome, XFCE, KDE @@ -28,5 +19,14 @@ cat /tmp/kinto/caret journalctl --user-unit=keyswap.service -b ``` +**Describe the bug** +A clear and concise description of what the bug is. + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + **Additional context** Add any other context about the problem here. From b50522c5b1c3af387f00d17179295b1a0e4c32c0 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Wed, 1 Apr 2020 02:32:41 -0500 Subject: [PATCH 05/28] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 4bae2d4..4e004e6 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -19,6 +19,13 @@ cat /tmp/kinto/caret journalctl --user-unit=keyswap.service -b ``` +You may also run kinto in debug mode as of 1.0.6-2. This could help me resolve your problem faster. +``` +systemctl --user stop keyswap +cd ~/.config/kinto +./kintox11 --debug +``` + **Describe the bug** A clear and concise description of what the bug is. From 7e6f87298366ac75406355cb1c19c495d904da27 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Wed, 1 Apr 2020 02:38:30 -0500 Subject: [PATCH 06/28] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 41 +++++++++++++++------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 4e004e6..97fac0c 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -7,31 +7,34 @@ assignees: rbreaves --- -**Install Type:** Bare Metal or VM -**Distro:** Name + Version -**DE:** Gnome, XFCE, KDE -**Branch:** master, dev -**Commit:** git rev-parse --short HEAD - -If applicable include kinto log and the status of your input caret -``` -cat /tmp/kinto/caret -journalctl --user-unit=keyswap.service -b -``` - -You may also run kinto in debug mode as of 1.0.6-2. This could help me resolve your problem faster. -``` -systemctl --user stop keyswap -cd ~/.config/kinto -./kintox11 --debug -``` - **Describe the bug** A clear and concise description of what the bug is. **Expected behavior** A clear and concise description of what you expected to happen. +**Install Type:** Bare Metal or VM +**Distro:** Name + Version +**DE:** Gnome, XFCE, KDE +**Branch:** master, dev +**Commit:** git rev-parse --short HEAD + +**Kinto Input Caret Status** +``` +cat /tmp/kinto/caret +``` + +**Kinto Standard Log** +``` +journalctl --user-unit=keyswap.service -b +``` +**Kinto Debug Log (1.0.6-2+)** +``` +systemctl --user stop keyswap +cd ~/.config/kinto +./kintox11 --debug +``` + **Screenshots** If applicable, add screenshots to help explain your problem. From e892f045f55cda7c6b1ada9d3e898dd305198665 Mon Sep 17 00:00:00 2001 From: Indrek Juhkam Date: Thu, 2 Apr 2020 14:58:47 +0300 Subject: [PATCH 07/28] Add kitty to terminal emulators list See: https://sw.kovidgoyal.net/kitty/ --- README.md | 2 +- defaults.json | 2 +- user_config.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ba609f9..b108f3e 100644 --- a/README.md +++ b/README.md @@ -363,7 +363,7 @@ You can also add additional Desktop Environment related tweaks to user_config.js "name":"term", "run":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.term $DISPLAY", "de":[2], - "appnames":[ "Gnome-terminal","konsole","io.elementary.terminal","terminator","sakura","guake","tilda","xterm","eterm" ], + "appnames":[ "Gnome-terminal","konsole","io.elementary.terminal","terminator","sakura","guake","tilda","xterm","eterm","kitty" ], "run_onInput":"", "run_offInput": "killall xbindkeys > /dev/null 2>&1", "symbols":"", diff --git a/defaults.json b/defaults.json index 77f8075..d14e642 100644 --- a/defaults.json +++ b/defaults.json @@ -1,6 +1,6 @@ {"defaultapps":[{ "name":"term", - "appnames":[ "Gnome-terminal","konsole","io.elementary.terminal","terminator","sakura","guake","tilda","xterm","eterm" ] + "appnames":[ "Gnome-terminal","konsole","io.elementary.terminal","terminator","sakura","guake","tilda","xterm","eterm","kitty" ] }], "defaulttypes":["windows","mac","chromebook"], "defaults":[{ diff --git a/user_config.json b/user_config.json index 9652547..92268c2 100644 --- a/user_config.json +++ b/user_config.json @@ -16,7 +16,7 @@ "symbols":"", "types":"", "de":[], - "appnames":[ "Gnome-terminal","konsole","io.elementary.terminal","terminator","sakura","guake","tilda","xterm","eterm" ] + "appnames":[ "Gnome-terminal","konsole","io.elementary.terminal","terminator","sakura","guake","tilda","xterm","eterm","kitty" ] }, { "name": "firefox", From ca4f9be6eec6e755b9cd9cffa41d4b78f51c84ef Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 4 Apr 2020 04:15:46 -0500 Subject: [PATCH 08/28] - Added sharpkeys config and autohotkey script for mac on Windows parity --- windows/kinto.ahk | 15 +++++++++++++++ windows/macbook_winctrl_capsesc_swap.reg | Bin 0 -> 470 bytes windows/macbook_winctrl_swap.reg | Bin 0 -> 438 bytes windows/macbook_winctrl_swap.skl | Bin 0 -> 28 bytes windows/standard_ctrlalt_capsesc_swap.reg | Bin 0 -> 542 bytes windows/standard_ctrlalt_swap.reg | Bin 0 -> 518 bytes windows/standard_ctrlalt_swap.skl | Bin 0 -> 40 bytes 7 files changed, 15 insertions(+) create mode 100644 windows/kinto.ahk create mode 100644 windows/macbook_winctrl_capsesc_swap.reg create mode 100644 windows/macbook_winctrl_swap.reg create mode 100755 windows/macbook_winctrl_swap.skl create mode 100644 windows/standard_ctrlalt_capsesc_swap.reg create mode 100644 windows/standard_ctrlalt_swap.reg create mode 100755 windows/standard_ctrlalt_swap.skl diff --git a/windows/kinto.ahk b/windows/kinto.ahk new file mode 100644 index 0000000..a299907 --- /dev/null +++ b/windows/kinto.ahk @@ -0,0 +1,15 @@ +#IfWinActive ahk_exe ubuntu.exe +^c::Send {LCtrl down}{LShift down}c{LCtrl Up}{LShift Up} +#c::Send {LCtrl down}c{LCtrl Up} +#x::Send {LCtrl down}x{LCtrl Up} +#o::Send {LCtrl down}o{LCtrl Up} +#r::Send {LCtrl down}r{LCtrl Up} +#w::Send {LCtrl down}w{LCtrl Up} +#\::Send {LCtrl down}\{LCtrl Up} +#k::Send {LCtrl down}k{LCtrl Up} +#u::Send {LCtrl down}u{LCtrl Up} +#j::Send {LCtrl down}j{LCtrl Up} +#t::Send {LCtrl down}t{LCtrl Up} +#_::Send {LCtrl down}_{LCtrl Up} +^v::Send {LCtrl down}{LShift down}v{LCtrl Up}{LShift Up} +#If \ No newline at end of file diff --git a/windows/macbook_winctrl_capsesc_swap.reg b/windows/macbook_winctrl_capsesc_swap.reg new file mode 100644 index 0000000000000000000000000000000000000000..d5f021cccea3acaa69a115578fa57e798dc187fb GIT binary patch literal 470 zcmb7>!AiqW5Jk^g@E=0gMOq{q!G#3DVxwS-B1Vd~K?9OVYSI3D+mk0x1>H!~5#IMhYt bi{LTQ(@*xd`m;0j8{(AikH;zBdAx%iy*xts literal 0 HcmV?d00001 diff --git a/windows/macbook_winctrl_swap.reg b/windows/macbook_winctrl_swap.reg new file mode 100644 index 0000000000000000000000000000000000000000..2d9406f06528105c05a0db7607c31fa614201a67 GIT binary patch literal 438 zcmb7=!AiqW6hzNj@E=0gMOtV!f(r?PrA-AZikMQg4Q-$#CADaOUOjmw*o7Mj@4Y*7 z=guAS{q;ma$&!i>c0}Bhvy$8KPR&8)#%>|1#1W77YrBQG6vtf9^E>A(oEL5xIrGe% zF?S?f`_4&y6MI7@b~C0braV}uqJ+J!wce$hlHlF!uh^){85-m990G##fGvZZ&WCRde;w{*B-E&k*(&~o)np-K UWTvCyI2oI@b!q-=>+)Ow0H7E^WdHyG literal 0 HcmV?d00001 diff --git a/windows/macbook_winctrl_swap.skl b/windows/macbook_winctrl_swap.skl new file mode 100755 index 0000000000000000000000000000000000000000..51aa77844dfb5eeca1eb92bfeb75d095bf162c1a GIT binary patch literal 28 ZcmZQzfB+UC75zY#K^8(MrQW5Jk_k;6H>u7ilR05qyv!C^iaK6fsh48#Ew^q!#VZt0x;`5$Zz;$DalMU2^A}={`v= zoMmjZRT}#725Jk_k;C~2xE>e-82tG&<6dMIAiZoKx1`S9esYUzeZBI7D4=4o*J3IHz zotYbU`E^S{$&`u@W<*?(^DH;xotlNriPb_>i6d^T*H#O0DUR7;;J3|IIAcyZx95%t zLoP`;_MVV>C)Uomu$nPaG2+@h6(!7_T06URQxax3`zu~m<#LUt+1Rm}TXOw9%08%^ z>SbuQ5YJWJ2RA*tpJYp8r6yOEir?sQ#EbZo!{ERFuei@T{jM82evgCiJl193T?6B9 fO%^;xdfKdRJ6lbg$NtaXiJLXe3w6$Z^6t%65qe0I literal 0 HcmV?d00001 diff --git a/windows/standard_ctrlalt_swap.skl b/windows/standard_ctrlalt_swap.skl new file mode 100755 index 0000000000000000000000000000000000000000..887823037908e87c003d38daef5494c9ee8f247c GIT binary patch literal 40 fcmZQzfB<$NCCgyJ5d8p3KCpNY^FS6%f>Zzig=z`P literal 0 HcmV?d00001 From 4d423de14b24700cb4f81f67486aacd2c8fd6c2d Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 4 Apr 2020 21:12:16 -0500 Subject: [PATCH 09/28] - Added Windows 10 Support --- setup.py | 37 +++++++++++++++++++++++++++-- windows/autohotkey.ps1 | 12 ++++++++++ windows/kinto.ahk | 41 ++++++++++++++++++++++----------- windows/theme_campbell.reg | Bin 0 -> 2124 bytes windows/theme_legacy.reg | Bin 0 -> 2124 bytes windows/theme_onehalfdark.reg | Bin 0 -> 2222 bytes windows/theme_onehalflight.reg | Bin 0 -> 2124 bytes windows/theme_ubuntu.reg | Bin 0 -> 1796 bytes 8 files changed, 75 insertions(+), 15 deletions(-) create mode 100644 windows/autohotkey.ps1 create mode 100644 windows/theme_campbell.reg create mode 100644 windows/theme_legacy.reg create mode 100644 windows/theme_onehalfdark.reg create mode 100644 windows/theme_onehalflight.reg create mode 100644 windows/theme_ubuntu.reg diff --git a/setup.py b/setup.py index ec4ddec..3b97c28 100755 --- a/setup.py +++ b/setup.py @@ -36,12 +36,45 @@ def install_ibus(): input("IBus has been set as the default Input Method.\nPress any key to exit and re-run after logoff & logon...") sys.exit() +def windows_setup(): + keymaps = ["Apple keyboard standard", "Apple keyboard w/ Caps lock as Esc", "Windows keyboard standard", "Windows keyboard w/ Caps lock as Esc"] + for index, item in enumerate(keymaps): + print(" %i. %s" % (index+1, item.capitalize())) + default = 0 + while not int(default) in range(1,len(keymaps)+1): + default = int(input("\nPlease enter your desired keymap (1 - " + str(len(keymaps)) + ") : ")) + print("") + path= cmdline('echo %cd%')[:-1] + if default == 1: + os.system("regedit " + path + "\\windows\\macbook_winctrl_swap.reg") + elif default == 2: + os.system("regedit " + path + "\\windows\\macbook_winctrl_capsesc_swap.reg") + elif default == 3: + os.system("regedit " + path + "\\windows\\standard_ctrlalt_swap.reg") + elif default == 4: + os.system("regedit " + path + "\\windows\\standard_ctrlalt_capsesc_swap.reg") + print("Will now install chocolatey and autohotkey with elevated privileges...") + print("This install will fail if you are not running with elevated privileges") + os.system('powershell -executionpolicy bypass ".\\windows\\autohotkey.ps1"') + print("\nWill now install Ubuntu Terminal Theme as default...") + os.system("regedit " + path + "\\windows\\theme_ubuntu.reg") + print("Copying autohotkey combinations for Terminals & Editors...") + os.system("copy /Y " + path + "\\windows\\kinto.ahk \"C:\\ProgramData\\Microsoft\\Windows\\Start Menu\\Programs\\StartUp\\kinto.ahk\"") + print("\nPlease log off and back on for changes to take full effect.") + print("If using WSL then please remember to right click on title bar -> Properties -> Edit Options -> Use Ctrl+Shift+C/V as Copy/Paste and enable it.") + + # check_x11 = cmdline("env | grep -i x11").strip() check_x11 = cmdline("env | grep -i x11 || loginctl show-session \"$XDG_SESSION_ID\" -p Type | awk -F= '{print $2}'").strip() if len(check_x11) == 0: - print("You are not using x11, please logout and back in using x11/Xorg") - sys.exit() + if os.name != 'nt': + print("You are not using x11, please logout and back in using x11/Xorg") + sys.exit() + else: + print("You are detected as running Windows.") + windows_setup() + sys.exit() check_xbind = cmdline("which xbindkeys 2>/dev/null").strip() check_xdotool = cmdline("which xdotool 2>/dev/null").strip() diff --git a/windows/autohotkey.ps1 b/windows/autohotkey.ps1 new file mode 100644 index 0000000..5dd7305 --- /dev/null +++ b/windows/autohotkey.ps1 @@ -0,0 +1,12 @@ +$testchoco = powershell choco -v +if(-not($testchoco)){ + Write-Output "Seems Chocolatey is not installed, installing now" + Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) +} +else{ + Write-Output "Chocolatey Version $testchoco is already installed" +} + +if(-not(test-path "C:\Program Files\AutoHotkey\AutoHotkey.exe")){ + choco install autohotkey.install +} diff --git a/windows/kinto.ahk b/windows/kinto.ahk index a299907..eb1394f 100644 --- a/windows/kinto.ahk +++ b/windows/kinto.ahk @@ -1,15 +1,30 @@ +#IfWinActive ahk_exe sublime_text.exe + ; Remap Ctrl+Shift to behave like macOS Sublimetext + ; Will extend cursor to multiple lines + #+Up::send {shift up}^!{Up} + #+Down::send {shift up}^!{Down} + + ; Remap Ctrl+Cmd+G to select all matches + #^g::send !{F3} +#If + #IfWinActive ahk_exe ubuntu.exe -^c::Send {LCtrl down}{LShift down}c{LCtrl Up}{LShift Up} -#c::Send {LCtrl down}c{LCtrl Up} -#x::Send {LCtrl down}x{LCtrl Up} -#o::Send {LCtrl down}o{LCtrl Up} -#r::Send {LCtrl down}r{LCtrl Up} -#w::Send {LCtrl down}w{LCtrl Up} -#\::Send {LCtrl down}\{LCtrl Up} -#k::Send {LCtrl down}k{LCtrl Up} -#u::Send {LCtrl down}u{LCtrl Up} -#j::Send {LCtrl down}j{LCtrl Up} -#t::Send {LCtrl down}t{LCtrl Up} -#_::Send {LCtrl down}_{LCtrl Up} -^v::Send {LCtrl down}{LShift down}v{LCtrl Up}{LShift Up} + ^c::Send {LCtrl down}{LShift down}c{LCtrl Up}{LShift Up} + #c::Send {LCtrl down}c{LCtrl Up} + #x::Send {LCtrl down}x{LCtrl Up} + #o::Send {LCtrl down}o{LCtrl Up} + #r::Send {LCtrl down}r{LCtrl Up} + #w::Send {LCtrl down}w{LCtrl Up} + #\::Send {LCtrl down}\{LCtrl Up} + #k::Send {LCtrl down}k{LCtrl Up} + #u::Send {LCtrl down}u{LCtrl Up} + #j::Send {LCtrl down}j{LCtrl Up} + #t::Send {LCtrl down}t{LCtrl Up} + #_::Send {LCtrl down}_{LCtrl Up} + ^v::Send {LCtrl down}{LShift down}v{LCtrl Up}{LShift Up} +#If + +#IfWinActive ahk_exe powershell.exe + ^c::Send {LCtrl down}{LShift down}c{LCtrl Up}{LShift Up} + #c::Send {LCtrl down}c{LCtrl Up} #If \ No newline at end of file diff --git a/windows/theme_campbell.reg b/windows/theme_campbell.reg new file mode 100644 index 0000000000000000000000000000000000000000..84b272b993f866f7eea2ae2463310471837c8cb1 GIT binary patch literal 2124 zcmbuA-EPxB5QXO&iFc^-08tz#aomav)KWk|Ri#NQ1jtJ5xJ2YnPApm;9{6S*)3{x) zLaWur-d&%WGqaO3e|}%dR2GuRQhv%>4rCw`xnXZD8_DF3oj06LSuI%~$R+0)r&HDo z)?H~zi}6xknE6HC$pC6Z$qVQ;|dOopsSa>4sRzH*}IHNP|LeKW`-tTp6R#uBr4 z#&gcIA+MMbPKm5n)VRBROcYHJSD8F8qcgcvo7L=FvSdscLUeP05@ z--T{l(Jdkyi^uRyzUzGZR&+wNroI_1_~XnU=t(gs;fMHlMu-e{Gor|R1Z zZBP|lp-t!fA5?D(wR@;Fr9!o~wO3kviqfj`9-^1$uvnr{8J_3p?x|792`nP1c7)e3 zT$%l2zFmM?@NLZdOx_wRIp-hQQ>E1y5<0?&yyqs~+#sqpBO>W@Hyyrg^VHegc9KYL z&AqGQ2V_4(MStKy??U_34P0W*@*NLNyxuZ*`-oe4>5qcfStek)LY+vGvZ~UaNJs+bN%4llPtfFL5eG1ONa4 literal 0 HcmV?d00001 diff --git a/windows/theme_legacy.reg b/windows/theme_legacy.reg new file mode 100644 index 0000000000000000000000000000000000000000..ba748f770c0cdfb80db9372345b22e8b821cbb71 GIT binary patch literal 2124 zcmbuA>rUH15QWcgq`pIx2Z%7&0P2s57Fx9+6cSL?A`4Ew4DN$d4G*U$kUFw>%k;WS8fs-#-JM8-GD>}hG#M)usW52GN zmbpG?$*o`ds_$TaD%P%A_-n8`RFi#6$2>Rm8;hYw{C4qo=8!vht7=c@YIAnT{f>K8 zA6YTiXLeVdreMbSYx1sn89Qq==Oa5eUw1I=l85<8$kDP$wCy+>Z+{to&mcn|gZ%r< zU>X^{;Iho~$Wu@qs(1spdE!=GJ-Uut6V4Z|D#mOPbQDC_r*u0g^B&63;a)T3Jm}(HGv?-@EOxlpeB4>+;$Ac4EOfZnJkp~xb@=AA%GA^JZGbkI z3J%bwBmVQIx0%{aYmNVU%ZgkbtQO|+JxXiJyNzBR!J>~s4V^+(P*PLLOIXCpPlQh} z9Jupc-tB?v@ot;vuJ)am6#Ea(Old8Lgo)5X!%~-T>JWLKF_~CLukq#zcU!gRNfPT` z8(2*7H?>8C8{HBi;#=69x`s;|TRIV;M$~)OQH1&qW>XE9@(4Q|K)- lpuWKDStZ;5u%FP5QWcgB;KLQ14KAZ;4Xzf; zRF*G$IWuQx#%F&2y3$NbWm@TnHab#YV@;XcXscYe%)DfE#%RU(NFP|wS)DOnGVZ9U zCtQ#9$lagxT5rL8)JUfqVz1BWTm!~KUGm-6XI2co;W@|N7l&-41MZp+_(6M5*h)YY!?wnzC6h!;DP1IFXiEaha ziH`9c^Xyfk;~+Z4=QS15!Ml%hn0Y&hP8=>JYm-WJCy36#C0r?1s(g2Y=!C4KzpAJeD{GCBQ+s_b>h-urAD*0eE4=WeyGjeO(0nLe9} zuJLUD+Zr3jz!cqU>V0K9aPS&oJf5QM57Bbd_7hb30v0Pyo#T0dtuv>`V_1w-?m5q4 zxOVfW>|KIdvNz>>u2;@V!TLMqOw;WQ89isnzg4*N77kIiIif;)M6}J$7H_+oWY2ol zNH_dnZPz)h-g9*OJ02qbSnGsSxTLHWe|c!)^@iJbDvM1+7VQmlIh@|ZA>%t#9f#=p z414tdbsVq0Wn|qh7w^=!jIP(SBH~kK9qQ0lW&3V!b>{o=Axf6Bhu5U{Z#DS`3T9Rz literal 0 HcmV?d00001 diff --git a/windows/theme_onehalflight.reg b/windows/theme_onehalflight.reg new file mode 100644 index 0000000000000000000000000000000000000000..57ff8ed206b1016492c70fee0e36c85a76bdd206 GIT binary patch literal 2124 zcmbuA-EPxB5QXO&iFc^-08yRTangzlR45>zs?wwt0%Rq2QzG&wCl)Oa4}7zZA+9D% z1X^vJ-SwF{Gdn)>^T&-$Wg(d?<(sVKNcwUsckHcYBe^`V^ODmkt0n6rx#m3Qbjo_c zI+CUwGoH#5H$Td2c?;%)ByuK0?Dbh)$bj`wuK3@VPn;-v&F>6*pB?fPYYjPt1GDOvmiw?q6kTs~%w+W^jEmlb7Zp+jj&TYAjc#k>z4nCLOt z?MmqQYs~x5EfXEO8wkKpyuRBedhB?2@ZIyGLlYf>iljqsLoYfq(IZeT@FOhv;_jGe zy$j7+%F~CAO|({RHGSx=iH@k(2=0H&dCx?b-^_%l0}pepXRFp?a-Ow3|4t)=)J z!(DG}f7}7F*}fH*61}h10@zvT3|!1e@$U0&*ILYt>0SG4Ex@+rdjjKXsP9r8-Z-sN z^;CUZp$)2nE41knZ>qPY+CA2qN}-OoH&|Kx7o}C@JwY!oVX;J^ay-w`-E*gsx3Ea0 z-VvU|aOL*Tcy|G6!MiE{XY$HfDL8+}o+_=zkkJu_++{lZm0bJnk@ZmP5uJO1Vys| literal 0 HcmV?d00001 diff --git a/windows/theme_ubuntu.reg b/windows/theme_ubuntu.reg new file mode 100644 index 0000000000000000000000000000000000000000..0aeb1dfa2d99ed006db0e65589b0e446fb0808ea GIT binary patch literal 1796 zcmbW2;ZEBy6ot=kq`d>m15_kUn}%sW5E|RG4WUAZrh%%g4G^ugRniLB!w?$l^keU-XqtH8YpfOXDf5n6 z+M~VEj_W`4QJ=wl*HDKV;IGf@SZB-!I%V9~1r|d$JSX_ObjZl9P8`pf3jK68^Bw6O z8t$BBtbNDVR#$DMO28ZUHgxPo7a+T6HxD6n;zjR)%~6>CgS+iT8!}gqQ*?vesTXbW zur{KFly|)7jHq@%XFNmbt`}{*h2suKE%TyBy5bfydOOJ7^P=spI!KYqdwJ~=oVi`)FG=N4YtincAz=U)(_b` z1vO>wi19=poR=l`FRb0t7x)-c$p(BMOLi`J8e-GuP_g@NQ+6igiuD$!w+cAaJ>PT6 zdq~7{7;f|nhL{*yeZ5A@2;1@nLkre>`l|j}Y$APPcf(qZhOcNCGxkMyT?g#Fj%-9c zO!a~~Tj}=}q-FW4^*qQU7g>wyLy*_%@87)Va8{i41`XR)$HZq-b>VX5*m1AUyQ=5w ie?&n{q8EG?CA+iQ;pU9(k1|K|2|n!K^?y;b6FdQu+Z4zE literal 0 HcmV?d00001 From c57b5a3603f7a72592babf22f366b0c69e5af071 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 4 Apr 2020 21:17:49 -0500 Subject: [PATCH 10/28] - Updated readme to reflect Windows 10 Support --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 4ccba4b..06a90a9 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,12 @@ Kinto works for standard Windows, Apple and Chromebook keyboards. The following - IBus* - Fedora/RHEL/Manjaro/Arch/Debian/Ubuntu based distro 16.04+ +- Windows 10 & WSL is now supported +- Powershell - run as Administrator (for install) +- Chocolatey (for install) +- Python (for install) +- Autohotkey + Binary is included and will be installed, but you can also compile kintox11.c on your system. You will need to compile and install json-c first as its libraries will be required to compile and run the program. *IBus is needed to support wordwise during browser app usage as the keymap will need to change slightly depending if the cursor/caret is on screen waiting for input. Setup.py will set it but you can manually set it as well or check your current Input Method. From 4250967d5aba3d32469d54d316927c8059fcd0bb Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 4 Apr 2020 21:26:11 -0500 Subject: [PATCH 11/28] - Added reg file for keyswap removal --- windows/remove_keyswap.reg | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 windows/remove_keyswap.reg diff --git a/windows/remove_keyswap.reg b/windows/remove_keyswap.reg new file mode 100644 index 0000000..67121a2 --- /dev/null +++ b/windows/remove_keyswap.reg @@ -0,0 +1,3 @@ +Windows Registry Editor Version 5.00 + +[-HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Keyboard Layout\Scancode Map] \ No newline at end of file From 61e357b5da441ad1b64e4507812cde9b3da59d84 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 4 Apr 2020 21:35:43 -0500 Subject: [PATCH 12/28] - Added uninstall option for Windows --- setup.py | 25 +++++++++++++++---------- windows/remove_keyswap.reg | 3 ++- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/setup.py b/setup.py index 3b97c28..802214c 100755 --- a/setup.py +++ b/setup.py @@ -37,7 +37,7 @@ def install_ibus(): sys.exit() def windows_setup(): - keymaps = ["Apple keyboard standard", "Apple keyboard w/ Caps lock as Esc", "Windows keyboard standard", "Windows keyboard w/ Caps lock as Esc"] + keymaps = ["Apple keyboard standard", "Apple keyboard w/ Caps lock as Esc", "Windows keyboard standard", "Windows keyboard w/ Caps lock as Esc","Uninstall"] for index, item in enumerate(keymaps): print(" %i. %s" % (index+1, item.capitalize())) default = 0 @@ -53,15 +53,20 @@ def windows_setup(): os.system("regedit " + path + "\\windows\\standard_ctrlalt_swap.reg") elif default == 4: os.system("regedit " + path + "\\windows\\standard_ctrlalt_capsesc_swap.reg") - print("Will now install chocolatey and autohotkey with elevated privileges...") - print("This install will fail if you are not running with elevated privileges") - os.system('powershell -executionpolicy bypass ".\\windows\\autohotkey.ps1"') - print("\nWill now install Ubuntu Terminal Theme as default...") - os.system("regedit " + path + "\\windows\\theme_ubuntu.reg") - print("Copying autohotkey combinations for Terminals & Editors...") - os.system("copy /Y " + path + "\\windows\\kinto.ahk \"C:\\ProgramData\\Microsoft\\Windows\\Start Menu\\Programs\\StartUp\\kinto.ahk\"") - print("\nPlease log off and back on for changes to take full effect.") - print("If using WSL then please remember to right click on title bar -> Properties -> Edit Options -> Use Ctrl+Shift+C/V as Copy/Paste and enable it.") + elif default == 5: + os.system("regedit " + path + "\\windows\\remove_keyswap.reg") + if default > 0 and default < 5: + print("Will now install chocolatey and autohotkey with elevated privileges...") + print("This install will fail if you are not running with elevated privileges") + os.system('powershell -executionpolicy bypass ".\\windows\\autohotkey.ps1"') + print("\nWill now install Ubuntu Terminal Theme as default...") + os.system("regedit " + path + "\\windows\\theme_ubuntu.reg") + print("Copying autohotkey combinations for Terminals & Editors...") + os.system("copy /Y " + path + "\\windows\\kinto.ahk \"C:\\ProgramData\\Microsoft\\Windows\\Start Menu\\Programs\\StartUp\\kinto.ahk\"") + print("\nPlease log off and back on for changes to take full effect.") + print("If using WSL then please remember to right click on title bar -> Properties -> Edit Options -> Use Ctrl+Shift+C/V as Copy/Paste and enable it.") + else: + os.system("del \"C:\\ProgramData\\Microsoft\\Windows\\Start Menu\\Programs\\StartUp\\kinto.ahk\"") # check_x11 = cmdline("env | grep -i x11").strip() diff --git a/windows/remove_keyswap.reg b/windows/remove_keyswap.reg index 67121a2..b095966 100644 --- a/windows/remove_keyswap.reg +++ b/windows/remove_keyswap.reg @@ -1,3 +1,4 @@ Windows Registry Editor Version 5.00 -[-HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Keyboard Layout\Scancode Map] \ No newline at end of file +[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Keyboard Layout] +"Scancode Map"=- \ No newline at end of file From ccc081adbabdbe4d80b40ad74992ea9a9838054a Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 4 Apr 2020 22:00:24 -0500 Subject: [PATCH 13/28] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ff3d96c..b924a32 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [![GitHub release](https://img.shields.io/github/release/rbreaves/kinto.svg)](https://github.com/rbreaves/kinto/releases/latest) -\- Type in Linux like it's a Mac. \- +\- Type in Linux & Windows like it's a Mac. \- Seamless copy and paste with all apps and terminals. Also the only linux remapper that is aware of your cursor/caret status - meaning it avoids shortcut conflicts within an app versus wordwise shortcuts when a text field is in use. From 192a640e6ca05452eabc657f61b3532cf75e42f0 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 4 Apr 2020 22:02:27 -0500 Subject: [PATCH 14/28] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b924a32..3f5e792 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ Kinto works for standard Windows, Apple and Chromebook keyboards. The following - Fedora/RHEL/Manjaro/Arch/Debian/Ubuntu based distro 16.04+ - Windows 10 & WSL is now supported +- WSL Ubuntu edition (you can modify windows/kinto.ahk to support more) - Powershell - run as Administrator (for install) - Chocolatey (for install) - Python (for install) From 1a07a55fa9cc2fba727699b8e5bb4d17bd1eb3dd Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 4 Apr 2020 22:05:43 -0500 Subject: [PATCH 15/28] Update README.md --- README.md | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 3f5e792..900221d 100644 --- a/README.md +++ b/README.md @@ -28,13 +28,6 @@ Kinto works for standard Windows, Apple and Chromebook keyboards. The following - IBus* - Fedora/RHEL/Manjaro/Arch/Debian/Ubuntu based distro 16.04+ -- Windows 10 & WSL is now supported -- WSL Ubuntu edition (you can modify windows/kinto.ahk to support more) -- Powershell - run as Administrator (for install) -- Chocolatey (for install) -- Python (for install) -- Autohotkey - Binary is included and will be installed, but you can also compile kintox11.c on your system. You will need to compile and install json-c first as its libraries will be required to compile and run the program. *IBus is needed to support wordwise during browser app usage as the keymap will need to change slightly depending if the cursor/caret is on screen waiting for input. Setup.py will set it but you can manually set it as well or check your current Input Method. @@ -43,6 +36,16 @@ On most distros you can confirm navigate to your "Language Support" and set "Key Wayland support is planned, but not ready yet. +## Kinto for Windows 10 Requirements + +- WSL Ubuntu edition (you can modify windows/kinto.ahk to support more) +- Powershell - run as Administrator +- Chocolatey (setup takes care of it) +- Python (setup takes care of it) +- Autohotkey (setup takes care of it) + +Does not have complete parity with the Linux edition, but it does work and can be built on and added to as needed. + ## How to install 1. clone this repo From e755c84b27adcf21f05093b4475cd27d38e8c6dd Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 4 Apr 2020 22:07:49 -0500 Subject: [PATCH 16/28] Update README.md --- README.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 900221d..e9fe19a 100644 --- a/README.md +++ b/README.md @@ -38,13 +38,15 @@ Wayland support is planned, but not ready yet. ## Kinto for Windows 10 Requirements -- WSL Ubuntu edition (you can modify windows/kinto.ahk to support more) +- WSL Ubuntu edition - Powershell - run as Administrator -- Chocolatey (setup takes care of it) -- Python (setup takes care of it) -- Autohotkey (setup takes care of it) -Does not have complete parity with the Linux edition, but it does work and can be built on and added to as needed. +Does not have complete parity with the Linux edition, but it does work and can be built on and added to as needed. Modify ./windows/kinto.ahk if you want to add more WSL editions or other terminals. + +Other programs that will be installed when you run ./setup.py +- Chocolatey +- Python3 +- Autohotkey ## How to install From 087d7a7d0e18a7ba447fe6753cf1e9bc09660cc3 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 4 Apr 2020 22:08:48 -0500 Subject: [PATCH 17/28] Update README.md --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e9fe19a..fc337c7 100644 --- a/README.md +++ b/README.md @@ -40,14 +40,13 @@ Wayland support is planned, but not ready yet. - WSL Ubuntu edition - Powershell - run as Administrator - -Does not have complete parity with the Linux edition, but it does work and can be built on and added to as needed. Modify ./windows/kinto.ahk if you want to add more WSL editions or other terminals. - Other programs that will be installed when you run ./setup.py - Chocolatey - Python3 - Autohotkey +Does not have complete parity with the Linux edition, but it does work and can be built on and added to as needed. Modify ./windows/kinto.ahk if you want to add more WSL editions or other terminals. + ## How to install 1. clone this repo From deac0cfb0abd712d431b9641c88185384be60124 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 4 Apr 2020 22:09:30 -0500 Subject: [PATCH 18/28] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index fc337c7..4aa7bac 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,7 @@ Wayland support is planned, but not ready yet. - WSL Ubuntu edition - Powershell - run as Administrator + Other programs that will be installed when you run ./setup.py - Chocolatey - Python3 From 05ead513222dda646dedd1f6e1633f49b50f48df Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 4 Apr 2020 22:14:00 -0500 Subject: [PATCH 19/28] Update README.md --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 4aa7bac..a334a46 100644 --- a/README.md +++ b/README.md @@ -509,6 +509,11 @@ I'd appreciate any help from people with non-US based keyboards, to help ensure If you would like to attempt adding additional custom keymaps for other languages then I strongly recommend reading Glen Whitney's post here. https://superuser.com/questions/385748/binding-superc-superv-to-copy-and-paste +## Notes about Windows 10 +Sharpkeys was used to create the layout/reg files to swap the Ctrl, Win and Alt keys. Sharpkeys was not required however because the reg keys were extracted. Autohotkey is used to manage keyswaps needed for terminal usage. Autohotkey is also used to add additional mac like keybinds for Sublime text and can be used for other apps as well. + +Microsoft is working on a new Powertoy Keyboard Manager that could be used with an easier to use GUI interface, but this approach should be fully sufficient for a mac like experience and autohotkeys appears to be more than capable enough to handle complex rebinding of any or most mac like shortcuts. + ## Contributing I welcome any and all contributors who want to contribute something to this project. From 08c02c2b8fc3928843656270e390bdb7ef5be578 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 4 Apr 2020 22:56:18 -0500 Subject: [PATCH 20/28] - Updated Windows 10 to support proper app switching and in-app tab switching --- windows/kinto.ahk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/windows/kinto.ahk b/windows/kinto.ahk index eb1394f..632d34d 100644 --- a/windows/kinto.ahk +++ b/windows/kinto.ahk @@ -1,3 +1,10 @@ +; Cmd Tab For App Switching +LCtrl & Tab::AltTab +RCtrl & Tab::AltTab +; Ctrl Tab for In-App Tab Switching +LWin & Tab::Send ^{Tab} +RWin & Tab::Send ^{Tab} + #IfWinActive ahk_exe sublime_text.exe ; Remap Ctrl+Shift to behave like macOS Sublimetext ; Will extend cursor to multiple lines From 6965d81c79bffda92bc2230c4e1a0a14e877c31c Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 4 Apr 2020 23:07:49 -0500 Subject: [PATCH 21/28] - Windows 10, wordwise and close app support --- windows/kinto.ahk | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/windows/kinto.ahk b/windows/kinto.ahk index 632d34d..1c4cab8 100644 --- a/windows/kinto.ahk +++ b/windows/kinto.ahk @@ -5,6 +5,25 @@ RCtrl & Tab::AltTab LWin & Tab::Send ^{Tab} RWin & Tab::Send ^{Tab} +; Close Apps +^q::Send !{F4} + +// wordwise support +$^Left::Send {Home} +$^+Left::Send +{Home} +$^Right::Send {End} +$^+Right::Send +{End} +^Up::Send ^{Home} +^+Up::Send ^+{Home} +^Down::Send ^{End} +^+Down::Send ^+{End} +^Backspace::Send +{Home}{Delete} +!Backspace::Send ^{Backspace} +!Left::Send ^{Left} +!+Left::Send ^+{Left} +!Right::Send ^{Right} +!+Right::Send ^+{Right} + #IfWinActive ahk_exe sublime_text.exe ; Remap Ctrl+Shift to behave like macOS Sublimetext ; Will extend cursor to multiple lines From dc2f9c332d7877f8f752513571e255d76835882a Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 4 Apr 2020 23:09:30 -0500 Subject: [PATCH 22/28] - Corrected comment --- windows/kinto.ahk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/kinto.ahk b/windows/kinto.ahk index 1c4cab8..71bbd80 100644 --- a/windows/kinto.ahk +++ b/windows/kinto.ahk @@ -8,7 +8,7 @@ RWin & Tab::Send ^{Tab} ; Close Apps ^q::Send !{F4} -// wordwise support +; wordwise support $^Left::Send {Home} $^+Left::Send +{Home} $^Right::Send {End} From 4849fb55ac7a8e6af41dacbe2414bd0202be14b3 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 4 Apr 2020 23:28:00 -0500 Subject: [PATCH 23/28] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a334a46..bffdd3d 100644 --- a/README.md +++ b/README.md @@ -40,10 +40,10 @@ Wayland support is planned, but not ready yet. - WSL Ubuntu edition - Powershell - run as Administrator +- Python3 Other programs that will be installed when you run ./setup.py - Chocolatey -- Python3 - Autohotkey Does not have complete parity with the Linux edition, but it does work and can be built on and added to as needed. Modify ./windows/kinto.ahk if you want to add more WSL editions or other terminals. From ea70936454659389d6d0af75c158d6147e3edee5 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sun, 5 Apr 2020 00:14:18 -0500 Subject: [PATCH 24/28] - Added groupings for Windows ahk script --- windows/kinto.ahk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/windows/kinto.ahk b/windows/kinto.ahk index 71bbd80..f6af96a 100644 --- a/windows/kinto.ahk +++ b/windows/kinto.ahk @@ -1,3 +1,7 @@ +GroupAdd, terminals, ahk_exe ubuntu.exe + +GroupAdd, editors, ahk_exe sublime_text.exe + ; Cmd Tab For App Switching LCtrl & Tab::AltTab RCtrl & Tab::AltTab @@ -24,7 +28,7 @@ $^+Right::Send +{End} !Right::Send ^{Right} !+Right::Send ^+{Right} -#IfWinActive ahk_exe sublime_text.exe +#IfWinActive ahk_group editors ; Remap Ctrl+Shift to behave like macOS Sublimetext ; Will extend cursor to multiple lines #+Up::send {shift up}^!{Up} @@ -34,7 +38,7 @@ $^+Right::Send +{End} #^g::send !{F3} #If -#IfWinActive ahk_exe ubuntu.exe +#IfWinActive ahk_group terminals ^c::Send {LCtrl down}{LShift down}c{LCtrl Up}{LShift Up} #c::Send {LCtrl down}c{LCtrl Up} #x::Send {LCtrl down}x{LCtrl Up} From ed7c68a388e5b594d414c59fd0dfca838fd2c178 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sun, 5 Apr 2020 03:05:24 -0500 Subject: [PATCH 25/28] - Remapped Start Menu in Windows to Cmd+Space --- windows/kinto.ahk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/windows/kinto.ahk b/windows/kinto.ahk index f6af96a..ad881f0 100644 --- a/windows/kinto.ahk +++ b/windows/kinto.ahk @@ -2,6 +2,14 @@ GroupAdd, terminals, ahk_exe ubuntu.exe GroupAdd, editors, ahk_exe sublime_text.exe +; Cmd+Space Alternative +LWin & vk07::return +LWin::return +RWin & vk07::return +RWin::return +^Space::Send ^{Esc} +; ^Space::run AppName + ; Cmd Tab For App Switching LCtrl & Tab::AltTab RCtrl & Tab::AltTab From 9608ef95ae3db3833b9971246406d9a11d60d811 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sun, 5 Apr 2020 17:04:08 -0500 Subject: [PATCH 26/28] - Added ConEmu/Cmder, mintty, and powershell support --- windows/kinto.ahk | 67 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 62 insertions(+), 5 deletions(-) diff --git a/windows/kinto.ahk b/windows/kinto.ahk index ad881f0..8b5d42d 100644 --- a/windows/kinto.ahk +++ b/windows/kinto.ahk @@ -1,4 +1,15 @@ GroupAdd, terminals, ahk_exe ubuntu.exe +GroupAdd, terminals, ahk_exe ConEmu.exe +GroupAdd, terminals, ahk_exe ConEmu64.exe +GroupAdd, terminals, ahk_exe powershell.exe + +GroupAdd, posix, ahk_exe ubuntu.exe +GroupAdd, posix, ahk_exe ConEmu.exe +GroupAdd, posix, ahk_exe ConEmu64.exe +GroupAdd, posix, ahk_exe mintty.exe + +GroupAdd, ConEmu, ahk_exe ConEmu.exe +GroupAdd, ConEmu, ahk_exe ConEmu64.exe GroupAdd, editors, ahk_exe sublime_text.exe @@ -47,22 +58,68 @@ $^+Right::Send +{End} #If #IfWinActive ahk_group terminals + ; Copy ^c::Send {LCtrl down}{LShift down}c{LCtrl Up}{LShift Up} #c::Send {LCtrl down}c{LCtrl Up} +#If + +#IfWinActive ahk_group posix + ; End of Line + #e::Send {LCtrl down}e{LCtrl Up} + ^e::return + ; Beginning of Line + #a::Send {LCtrl down}a{LCtrl Up} + ^a::return + ;^l::Send clear{Enter} + ;#l::return + ; Clear Terminal and Scroll Buffer + ^k::Send clear && printf '\e[3J'{Enter} + ; Nano editor shortcuts + #k::Send {LCtrl down}k{LCtrl Up} #x::Send {LCtrl down}x{LCtrl Up} #o::Send {LCtrl down}o{LCtrl Up} #r::Send {LCtrl down}r{LCtrl Up} #w::Send {LCtrl down}w{LCtrl Up} #\::Send {LCtrl down}\{LCtrl Up} - #k::Send {LCtrl down}k{LCtrl Up} #u::Send {LCtrl down}u{LCtrl Up} #j::Send {LCtrl down}j{LCtrl Up} #t::Send {LCtrl down}t{LCtrl Up} #_::Send {LCtrl down}_{LCtrl Up} +#If + +#IfWinActive ahk_group ConEmu + ; Paste + $^v::Send {Shift down}{Insert}{Shift Up} + #v::^v +#If + +#IfWinActive ahk_exe mintty.exe + ; Copy + $^c::Send {Control down}{Insert}{Control Up} + #c::Send {LCtrl down}c{LCtrl Up} + ; Paste + $^v::Send {Shift down}{Insert}{Shift Up} + #v::Send {LCtrl down}v{LCtrl Up} +#If + +#IfWinActive ahk_exe ubuntu.exe + ; Paste ^v::Send {LCtrl down}{LShift down}v{LCtrl Up}{LShift Up} #If -#IfWinActive ahk_exe powershell.exe - ^c::Send {LCtrl down}{LShift down}c{LCtrl Up}{LShift Up} - #c::Send {LCtrl down}c{LCtrl Up} -#If \ No newline at end of file +;Disable win + l key locking (This line must come before any hotkey assignments in the .ahk file) + +; Admin privileges required +; Sets Workstation Lock to not occur on Win+L +; RegWrite, REG_DWORD, HKEY_CURRENT_USER, Software\Microsoft\Windows\CurrentVersion\Policies\System, DisableLockWorkstation, 1 + +; Re-enables Workstation lock on Ctrl+Cmd+Q +; Need to Remove Quick Assist and reboot +; Remove-WindowsCapability -online -name App.Support.QuickAssist~~~~0.0.1.0 +#^q:: +; re-enable locking workstation, then lock it +; RegWrite, REG_DWORD, HKEY_CURRENT_USER, Software\Microsoft\Windows\CurrentVersion\Policies\System, DisableLockWorkstation, 0 +; DllCall("LockWorkStation") +; Reload script to relock Workstation Lock +; Reload +;return \ No newline at end of file From 5f75f668526dafd2f142a60abd2b4864df1831fa Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sun, 5 Apr 2020 17:39:28 -0500 Subject: [PATCH 27/28] - Added Ctrl-Z to posix terminals for Windows --- windows/kinto.ahk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/windows/kinto.ahk b/windows/kinto.ahk index 8b5d42d..63fbfe8 100644 --- a/windows/kinto.ahk +++ b/windows/kinto.ahk @@ -85,12 +85,13 @@ $^+Right::Send +{End} #j::Send {LCtrl down}j{LCtrl Up} #t::Send {LCtrl down}t{LCtrl Up} #_::Send {LCtrl down}_{LCtrl Up} + #z::Send {LCtrl down}z{LCtrl Up} #If #IfWinActive ahk_group ConEmu ; Paste $^v::Send {Shift down}{Insert}{Shift Up} - #v::^v + #v::Send {LCtrl down}v{LCtrl Up} #If #IfWinActive ahk_exe mintty.exe From 89500c97c667c2844e18f1a598e16b3e7e7ce690 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Mon, 6 Apr 2020 01:23:26 -0500 Subject: [PATCH 28/28] - Added Windows Terminal Support --- windows/kinto.ahk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/windows/kinto.ahk b/windows/kinto.ahk index 63fbfe8..cb747ad 100644 --- a/windows/kinto.ahk +++ b/windows/kinto.ahk @@ -2,6 +2,7 @@ GroupAdd, terminals, ahk_exe ubuntu.exe GroupAdd, terminals, ahk_exe ConEmu.exe GroupAdd, terminals, ahk_exe ConEmu64.exe GroupAdd, terminals, ahk_exe powershell.exe +GroupAdd, terminals, ahk_exe WindowsTerminal.exe GroupAdd, posix, ahk_exe ubuntu.exe GroupAdd, posix, ahk_exe ConEmu.exe @@ -10,6 +11,7 @@ GroupAdd, posix, ahk_exe mintty.exe GroupAdd, ConEmu, ahk_exe ConEmu.exe GroupAdd, ConEmu, ahk_exe ConEmu64.exe +GroupAdd, ConEmu, ahk_exe WindowsTerminal.exe GroupAdd, editors, ahk_exe sublime_text.exe