kanata

programs/kanata/default.nix

@@ -26,25 +26,29 @@ let
 
     (deflayer control
       @esc
-      grv  1    2    3    4    5    6    7    8    9    0    -    =    bspc
+      grv  1       2      3        4     5    6    7    8    9    0    -    =    bspc
-      tab  q    w    e @replay t    y    u    i    o    p  @wup @wdown  \
+      tab  @mcleft @mup @mcright @replay t    y    u    i    o    p  @wup @wdown  \
-      @cap a    s    d    f    g  left  down  up  right ;    '    bspc
+      @cap @mleft @mdown @mright f       g  left  down  up  right ;    '    bspc
       lsft z    x   C-c   v   bspc  n  @macro ,    .   C-f    rsft
       lctl lmet lalt           spc            ralt @rctl
     )
 
-    (deflayermap (programming)
+    (deflayermap (other)
-      f (macro f n spc)
+      w @mup
-      w (macro w h e r e spc)
+      a @mleft
-      l (macro l o o p { ret)
+      s @mdown
-      u (macro u s e spc)
+      d @mright
-      i (macro i m p o r t spc)
+
-      s (macro s e l f spc)
+      q @mcleft
+      e @mcright
+
+      [ @wup
+      ] @wdown
     )
 
     (defalias
       ;; hold esc
-      esc (tap-hold 800 800 esc caps)
+      esc (tap-hold 200 200 C-k (macro C-f esc))
 
       ;; control
       cap (tap-hold-release 200 200
@@ -58,6 +62,14 @@ let
         lmet
       )
 
+      mup (movemouse-up 1 1)
+      mleft (movemouse-left 1 1)
+      mdown (movemouse-down 1 1)
+      mright (movemouse-right 1 1)
+
+      mcleft mlft
+      mcright mrgt
+
       macro (dynamic-macro-record 0)
       replay (dynamic-macro-play 0)
 
@@ -68,7 +80,7 @@ let
       rctl (
         tap-hold-release
         200 200
-        C-k (layer-while-held programming)
+        C-k (layer-while-held other)
       )
     )
   '';