diff --git a/programs/jj/default.nix b/programs/jj/default.nix
index 4d8bcdc..2615e25 100644
--- a/programs/jj/default.nix
+++ b/programs/jj/default.nix
@@ -39,8 +39,8 @@
         # diff-editor = "${pkgs.meld}/bin/meld";
       };
 
-      core.fsmonitor = "watchman";
-      core.watchman.register-snapshot-trigger = true;
+      fsmonitor.backend = "watchman";
+      fsmonitor.watchman.register-snapshot-trigger = true;
 
       revsets.log = "@ | ancestors(tronk()..(visible_heads() & mine()), 2) | tronk()";
       # revsets.log = "trunk()..@ | @..trunk() | trunk() | @:: | fork_point(trunk() | @)";
@@ -94,9 +94,6 @@
             "show"
             "--stat"
           ];
-          st = [
-            "status"
-          ];
           move = [
             "rebase"
             "-r"
@@ -149,6 +146,7 @@
             )
           )
         '';
+        git_push_bookmark = ''"jdonszelmann/" ++ change_id.short()'';
       };
 
       signing = {
@@ -159,7 +157,6 @@
       };
 
       git = {
-        push-bookmark-prefix = "jdonszelmann/";
         private-commits = "description(glob:'wip:*') | description(glob:'trial:*')";
         write-change-id-header = true;
 
diff --git a/programs/kanata/cfg.kbd b/programs/kanata/cfg.kbd
index 16d416d..04f311a 100644
--- a/programs/kanata/cfg.kbd
+++ b/programs/kanata/cfg.kbd
@@ -17,7 +17,7 @@
   tab  q    w    e    r    t    y    u    i    o    p    [    ]    \
   @cap a    s    d    f    g    h    j    k    l    ;    '    ret
   lsft z    x    c    v    b    n    m    ,    .    /    rsft
-  lctl lmet lalt           spc            ralt rctl
+  lctl lmet lalt           spc            ralt @rctl
 )
 
 (deflayer control
@@ -26,12 +26,23 @@
   tab  q    w    e @replay t    y    u    i    o    p  @wup @wdown  \
   @cap a    s    d    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
+  lctl lmet lalt           spc            ralt @rctl
+)
+
+(deflayermap (programming)
+  f (macro f n spc)
+  w (macro w h e r e spc)
+  l (macro l o o p { ret)
+  u (macro u s e spc)
+  i (macro i m p o r t spc)
+  s (macro s e l f spc)
 )
 
 (defalias
+  ;; hold esc
   esc (tap-hold 800 800 esc caps)
 
+  ;; control
   cap (tap-hold-release 200 200
     (multi dynamic-macro-record-stop esc)
     (layer-while-held control)
@@ -43,7 +54,13 @@
   wup (mwheel-up 50 120)
   wdown (mwheel-down 50 120)
 
-  lst (tap-hold-release 200 200 C-k lsft)
+  ;; programming
+  rctl (
+    tap-hold-release
+    200 200
+    C-k (layer-while-held programming)
+  )
+
 )
 
 
diff --git a/server exited unexpectedly b/server exited unexpectedly
deleted file mode 100644
index c29f9e9..0000000
--- a/server exited unexpectedly	
+++ /dev/null
@@ -1 +0,0 @@
-Ptmux;_Ga=d,q=2,d=a\\
\ No newline at end of file