diff --git a/home.nix b/home.nix
index 4ae60ef..d9161e4 100644
--- a/home.nix
+++ b/home.nix
@@ -166,6 +166,20 @@
   # Use kickstart.nvim configuration from flake
   programs.neovim-kickstart.enable = true;
 
+  # Claude Code configuration
+  home.file.".claude/settings.json" = {
+    text = builtins.toJSON {
+      permissions = {
+        allow = [
+          "Edit"
+          "Write"
+          "Bash(git *)"
+        ];
+      };
+      customInstructions = "When working in a git repository, always use conventional commits format (e.g., feat:, fix:, docs:, style:, refactor:, test:, chore:) for commit messages.";
+    };
+  };
+
   programs.ssh = {
     enable = true;
     enableDefaultConfig = false;