1 files changed, 20 insertions, 101 deletions
diff --git a/_windows/ahk/capslock.ahk b/_windows/ahk/capslock.ahk
index 85f81e4..b84462d 100644
--- a/_windows/ahk/capslock.ahk
+++ b/_windows/ahk/capslock.ahk
@@ -11,7 +11,6 @@ GroupAdd("Browser", "ahk_exe msedge.exe")
 GroupAdd("Browser", "ahk_exe firefox.exe")
 
 CapsLockState := false
-ShiftLockState := false
 HarpoonLastWindowIndex := 0
 
 HarpoonRun(winTitle) {
@@ -33,108 +32,28 @@ HarpoonRun(winTitle) {
     WinActivate windows[HarpoonLastWindowIndex + 1]
 }
 
-#HotIf GetKeyState("CapsLock", "P")
-\::{
-    global CapsLockState := not CapsLockState
-    SetCapsLockState CapsLockState
-}
-Enter::{
-    global ShiftLockState := not ShiftLockState
-    if ShiftLockState {
-        SendInput "{LShift Down}"
-    } else {
-        SendInput "{LShift Up}"
-    }
-}
-+Enter::{
-    global ShiftLockState := not ShiftLockState
-    if ShiftLockState {
-        SendInput "{LShift Down}"
-    } else {
-        SendInput "{LShift Up}"
-    }
-}
-
-; vim motion
-h::Left
-j::Down
-k::Up
-l::Right
-
-y::^Left
-u::^Down
-i::^Up
-o::^Right
-
-n::Home
-m::PgDn
-,::PgUp
-.::End
-
-; vim motion w select
-+h::+Left
-+j::+Down
-+k::+Up
-+l::+Right
-
-+y::^+Left
-+u::^+Down
-+i::^+Up
-+o::^+Right
+CapsLock::LCtrl
 
-+n::+Home
-+m::+PgDn
-+,::+PgUp
-+.::+End
+RAlt & `::HarpoonRun("ahk_exe WindowsTerminal.exe")
+RAlt & 1::HarpoonRun("ahk_exe Discord.exe")
+RAlt & 2::HarpoonRun("ahk_group IDE")
+RAlt & 3::HarpoonRun("ahk_group Browser")
+RAlt & 4::HarpoonRun("ahk_exe Element.exe")
+RAlt & 5::HarpoonRun("ahk_exe code.exe")
+RAlt & 0::HarpoonRun("ahk_exe WINWORD.EXE")
+RAlt & 9::HarpoonRun("ahk_class CabinetWClass")
 
-; harpoon
-`::HarpoonRun("ahk_exe WindowsTerminal.exe")
-1::HarpoonRun("ahk_exe Discord.exe")
-2::HarpoonRun("ahk_group IDE")
-3::HarpoonRun("ahk_group Browser")
-4::HarpoonRun("ahk_exe Element.exe")
-5::HarpoonRun("ahk_exe code.exe")
-0::HarpoonRun("ahk_exe WINWORD.EXE")
-e::HarpoonRun("ahk_class CabinetWClass")
-
-Esc::Run "taskmgr"
-
-; window manipulation
-!h::#Left
-!j::#Down
-!k::#Up
-!l::#Right
-
-!y::#+Left
-!u::#+Down
-!i::#+Up
-!o::#+Right
-
-; desktop switching
-!,::^#Left
-!m::^#Right
-
-q::Esc
-#HotIf
-
-CapsLock::{
-    KeyWait "CapsLock"
-    if A_ThisHotkey = "CapsLock" {
-        Send "{Escape}"
-    }
+RAlt & k::Send "#{Up}"
+RAlt & j::Send "#{Down}"
+RAlt & \::{
+    global CapsLockState := not CapsLockState
+    SetCapsLockState CapsLockState
 }
 
-!CapsLock::{
-    return
-}
-^CapsLock::{
-    return
-}
-^!CapsLock::{
-    return
-}
-+CapsLock::{
-    return
-}
+Tab & h::Left
+Tab & j::Down
+Tab & k::Up
+Tab & l::Right
+Tab::Tab
 
-Esc::F13
+RCtrl & Backspace::Reload