diff --git a/machines/fujin/main/dotfiles/.config/doom/config.el b/machines/fujin/main/dotfiles/.config/doom/config.el
index 835da19..c630e4f 100644
--- a/machines/fujin/main/dotfiles/.config/doom/config.el
+++ b/machines/fujin/main/dotfiles/.config/doom/config.el
@@ -395,3 +395,7 @@ Must be called BEFORE jdtls starts. Sets global lsp-java-vmargs."
 ;; (it contains markers/buffers that can't serialize properly)
 (after! savehist
   (add-to-list 'savehist-ignored-variables 'evil-jumps-history))
+
+;; vterm: use system default shell (nushell)
+(after! vterm
+  (setq vterm-shell (getenv "SHELL")))
diff --git a/machines/fujin/main/home.nix b/machines/fujin/main/home.nix
index f705c70..0b5d699 100644
--- a/machines/fujin/main/home.nix
+++ b/machines/fujin/main/home.nix
@@ -87,6 +87,13 @@
           directory = ["/home/${username}/nixos-dotfiles" "/home/${username}/.cache/nix"];
         };
       };
+      hooks = {
+        commit-msg = pkgs.writeScript "commit-msg" ''
+          #!${pkgs.bash}/bin/bash
+          # Remove Co-Authored-by lines from commit messages (Claude likes to add these)
+          ${pkgs.gnused}/bin/sed -i '/^Co-[Aa]uthored-[Bb]y:/d' "$1"
+        '';
+      };
     };
   };