diff --git a/nix/home/programs/git/default.nix b/nix/home/programs/git/default.nix
index c8220bd..f4f9de1 100644
--- a/nix/home/programs/git/default.nix
+++ b/nix/home/programs/git/default.nix
@@ -30,6 +30,7 @@ in
       ".yardoc/"
       "doc/"
       ".DS_Store"
+      ".jj/"
     ];
   };
 
diff --git a/nix/home/programs/jj/default.nix b/nix/home/programs/jj/default.nix
new file mode 100644
index 0000000..495c1bb
--- /dev/null
+++ b/nix/home/programs/jj/default.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+{
+  programs.jujutsu = {
+    enable = true;
+  };
+}
diff --git a/nix/home/programs/zsh/zshrc b/nix/home/programs/zsh/zshrc
index 93d1860..8e7fefa 100644
--- a/nix/home/programs/zsh/zshrc
+++ b/nix/home/programs/zsh/zshrc
@@ -11,7 +11,6 @@ source $HOME/.config/zsh/local.zsh
 
 bindkey '^[[A' history-substring-search-up
 bindkey '^[[B' history-substring-search-down
-bindkey -M viins 'jj' vi-cmd-mode
 
 # utility for storing functions under a new name
 save_function() {
diff --git a/nix/home/universal.nix b/nix/home/universal.nix
index 8f849e4..aa034b6 100644
--- a/nix/home/universal.nix
+++ b/nix/home/universal.nix
@@ -41,6 +41,7 @@ with builtins;
 
   imports = [
     (import ./programs/direnv)
+    (import ./programs/jj)
     (import ./programs/git)
     (import ./programs/zsh)
     (import ./programs/tmux)