diff --git a/home-manager/modules/nvim.nix b/home-manager/modules/nvim.nix
index 04ece8e..fe3b694 100644
--- a/home-manager/modules/nvim.nix
+++ b/home-manager/modules/nvim.nix
@@ -54,13 +54,23 @@
     };
 
     extraConfigLuaPre = ''
-      vim.loader.enable()
+      local autocmd = vim.api.nvim_create_autocmd
+      local augroup = vim.api.nvim_create_augroup
+
+      -- General Settings
+      local general = augroup("General Settings", { clear = true })
+
+      autocmd("BufEnter", {
+        callback = function()
+          vim.opt.formatoptions:remove { "c", "r", "o" }
+        end,
+        group = general,
+        desc = "Disable New Line Comment",
+      })
     '';
 
     extraConfigLuaPost = ''
       vim.notify = require("mini.notify").make_notify()
-
-      vim.opt.formatoptions:remove({'c', 'r', 'o'})
     '';
     extraPackages = with pkgs; [
       stylua