diff --git a/modules/common/neovim/default.nix b/modules/common/neovim/default.nix
index 8051c04..e04f1d6 100644
--- a/modules/common/neovim/default.nix
+++ b/modules/common/neovim/default.nix
@@ -20,6 +20,7 @@ in {
 
         # Use Neovim as the editor for git commit messages
         programs.git.extraConfig.core.editor = "nvim";
+        programs.jujutsu.settings.ui.editor = "nvim";
 
         # Set Neovim as the default app for text editing and manual pages
         home.sessionVariables = {
diff --git a/modules/common/shell/default.nix b/modules/common/shell/default.nix
index 82af041..59b17ef 100644
--- a/modules/common/shell/default.nix
+++ b/modules/common/shell/default.nix
@@ -7,6 +7,7 @@
     ./fzf.nix
     ./git.nix
     ./github.nix
+    ./jujutsu.nix
     ./nixpkgs.nix
     ./starship.nix
     ./utilities.nix
diff --git a/modules/common/shell/jujutsu.nix b/modules/common/shell/jujutsu.nix
new file mode 100644
index 0000000..1d84599
--- /dev/null
+++ b/modules/common/shell/jujutsu.nix
@@ -0,0 +1,21 @@
+{ config, ... }: {
+
+  config = {
+
+    home-manager.users.${config.user}.programs.jujutsu = {
+      enable = true;
+      enableFishIntegration = true;
+
+      # https://github.com/martinvonz/jj/blob/main/docs/config.md
+      settings = {
+        user = {
+          name = config.home-manager.users.${config.user}.programs.git.userName;
+          email =
+            config.home-manager.users.${config.user}.programs.git.userEmail;
+        };
+      };
+    };
+
+  };
+
+}