From 22e14a22d87a08f062480a5c88d9821de9958fe9 Mon Sep 17 00:00:00 2001
From: lulusillyyy <lunita@puppygirl.onl>
Date: Sat, 4 Apr 2026 19:21:49 -0400
Subject: [PATCH] Modified Kanata config

---
 dotfiles/ghostty/config  |  4 ++--
 dotfiles/kanata/conf.kbd | 33 +++++++++++++++++++++++++--------
 flake.nix                |  1 +
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/dotfiles/ghostty/config b/dotfiles/ghostty/config
index ce4fce3..5fc1ff8 100644
--- a/dotfiles/ghostty/config
+++ b/dotfiles/ghostty/config
@@ -20,12 +20,12 @@ keybind = cmd+f=toggle_split_zoom
 keybind = cmd+a>l=next_tab
 keybind = cmd+a>h=previous_tab
 
-keybind = super+r=reload_config
+keybind = cmd+r=reload_config
 
 quick-terminal-position = center
 quick-terminal-screen = main
 quick-terminal-animation-duration = 0.2
 quick-terminal-autohide = true
-keybind = super+shift+q=toggle_quick_terminal
+keybind = cmd+shift+q=toggle_quick_terminal
 
 window-save-state = always
diff --git a/dotfiles/kanata/conf.kbd b/dotfiles/kanata/conf.kbd
index 856af3c..feb7cf4 100755
--- a/dotfiles/kanata/conf.kbd
+++ b/dotfiles/kanata/conf.kbd
@@ -11,6 +11,13 @@
 (defcfg
     concurrent-tap-hold yes
     movemouse-smooth-diagonals yes
+
+    macos-dev-names-include (
+      "0xD4359520DA829EC8" ;; Macbook
+      "0x2E7E3EBD4C615B55" ;; Macbook
+      "0x4C044B7D74E4DBB4" ;; Gamestop keeb
+      "0xC7C83E024FB08653" ;; Razer Hunstman V2 TKL
+    )
 )
 #|
     Trying to be minimal in order to reduce constant editing 
@@ -41,6 +48,8 @@
     cho    (chord ch o)
     chs    (chord ch s)
     chd    (chord ch d)
+    chf    (chord ch f)
+    chj    (chord ch j)
     chk    (chord ch k)
     chl    (chord ch l)
     ch_lmet    (chord ch lmet)
@@ -57,6 +66,9 @@
     k      (tap-hold $tap-time $hold-time k    lmet)
     l      (tap-hold $tap-time $hold-time l    lalt)
     scln   (tap-hold $tap-time $hold-time scln rctl)
+    ;; Meh and Hyper key definitions
+    hyper  (multi lsft lctl lalt lmet)
+    meh    (multi lsft lctl lalt)
     ;; Numpad layer
     numpad (layer-while-held num)
     g      (tap-hold $tap-time $hold-time g @numpad) 
@@ -64,10 +76,10 @@
     fnkeys (layer-while-held fn)
     h      (tap-hold $tap-time $hold-time h @fnkeys)
     #|
-        Hyper key when V or M are held down to allow for either hand to
+        Meh key when V or M are held down to allow for either hand to
         use hyper key for AHK/Raycast shortcuts.
     |#
-    v	 (tap-hold $tap-time $hold-time v (multi lsft lctl lalt))
+    v	 (tap-hold $tap-time $hold-time v @meh)
     m	 (tap-hold $tap-time $hold-time m (multi lsft lctl lalt))
     ;; Holding Spacebar activates symbol layer
     symbols (layer-while-held symbol)
@@ -82,18 +94,23 @@
 (defchords ch $chord-time
     (w   ) w ;; W => W
     (   e) e ;; E => E
-    (w  e) ret ;; W + E => Enter
+    (w  e) XX ;; W + E => Enter
     (i   ) i ;; I => I
     (   o) o ;; O => O
-    (i  o) bspc ;; I + O => Backspace
+    (i  o) XX ;; I + O => 
     (s   ) @s ;; S => S
     (   d) @d ;; D => D
-    (s  d) tab ;; S + D => Tab
+    (s  d) ret ;; S + D => 
+    (f   ) @f
+    (f  d) tab ;; F + D = Tab
+    (j   ) @j
+    (j  k) esc ;; J + K => Escape
     (k   ) @k ;; K => K (See defalias)
     (   l) @l ;; L => L (See defalias)
-    (k  l) esc ;; K + L => Escape
-    (lmet   ) (tap-dance $tap-time ((multi lsft lctl lalt lmet) lmet)) ;; LCmd => Hyper Key, LCmd × 2 => LCmd
-    (   rmet) (tap-dance $tap-time ((multi lsft lctl lalt lmet) lmet)) ;; RCmd => Hyper Key, RAlt × 2 => RCmd
+    (k  l) bspc ;; K + L => Escape
+    ;; Cmd => Hyper Key, Cmd × 2 => Cmd
+    (lmet   ) (tap-dance $tap-time ((multi lsft lctl lalt lmet) lmet))
+    (   rmet) (tap-dance $tap-time ((multi lsft lctl lalt lmet) lmet))
     #| 
         Put simply, the below line allows for toggling a no-bind
         layer for when you may require a standard layout (such as
diff --git a/flake.nix b/flake.nix
index d93b825..7de9ceb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -58,6 +58,7 @@
           "zen"
           "obs"
           "krita"
+          "sioyek"
         ];
       };