diff --git a/config.nix b/config.nix
index 56a0ec4..3f6f98b 100644
--- a/config.nix
+++ b/config.nix
@@ -18,6 +18,10 @@
 
     cindent = true;
 
+    # Same as default, but without "0#,", which prevents typing "#"
+    # from going to the start of the line
+    cinkeys = "0{,0},0),0],:,!^F,o,O,e";
+
     signcolumn = "yes";
   };
 
@@ -199,6 +203,23 @@
     poppler-utils # (pdfinfo)
   ];
 
+  autoCmd = [
+    {
+      # Reset cinkeys when editing c/c++ files
+      command = "setlocal cinkeys&";
+      pattern = [
+        "*.c"
+        "*.h"
+        "*.cpp"
+        "*.hpp"
+      ];
+      event = [
+        "BufEnter"
+        "BufWinEnter"
+      ];
+    }
+  ];
+
   keymaps = [
     {
       action = "<Cmd>Dashboard<CR>";