From 45e614e0c8b0ef6d863e65558ba06ff8583c203a Mon Sep 17 00:00:00 2001
From: Henrik Bakken <bakken.henrik@gmail.com>
Date: Thu, 19 Mar 2026 22:50:20 +0100
Subject: [PATCH] nvim tweaks

---
 CONFIG/nvim/init.lua | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/CONFIG/nvim/init.lua b/CONFIG/nvim/init.lua
index c6d8ffc..a147170 100644
--- a/CONFIG/nvim/init.lua
+++ b/CONFIG/nvim/init.lua
@@ -56,7 +56,7 @@ vim.opt.foldtext = ""
 vim.opt.foldexpr = "v:lua.vim.treesitter.foldexpr()"
 
 -- Format settings
-vim.opt.formatoptions = "jroqlnt"
+vim.opt.formatoptions = "jqlnt"
 
 -- Grep settings
 vim.opt.grepformat = "%f:%l:%c:%m"
@@ -92,7 +92,7 @@ vim.diagnostic.config({
     },
     signs = false,
     virtual_lines = {
-        only_current_line = true,
+        current_line = true,
         spacing = vim.o.shiftwidth,
         severity = { min = vim.diagnostic.severity.ERROR },
     },
@@ -100,6 +100,14 @@ vim.diagnostic.config({
 })
 vim.lsp.set_log_level(2)
 
+vim.api.nvim_create_autocmd("FileType", {
+    desc = "Disable auto-commenting on new line",
+    pattern = "*",
+    callback = function()
+        vim.opt_local.formatoptions:remove({ "r", "o" })
+    end,
+})
+
 -- ----------------------------------------
 -- MAPS
 -- ----------------------------------------
@@ -168,12 +176,6 @@ map("n", "<leader>uI", function()
     vim.api.nvim_input("I")
 end, { desc = "Inspect Tree" })
 
--- Terminal Mappings overridden by Snacks.terminal
--- map("n", "<C-/>", "<cmd>terminal<cr>", { desc = "Show Terminal" })
--- map("t", "<C-/>", "<cmd>close<cr>", { desc = "Hide Terminal" })
--- map("n", "<C-_>", "<cmd>terminal<cr>", { desc = "which_key_ignore" })
--- map("t", "<C-_>", "<cmd>close<cr>", { desc = "which_key_ignore" })
-
 -- windows
 map("n", "<M-v>", "<cmd>vsplit<cr>", { desc = "Split Window Right", remap = true })
 map("n", "<M-s>", "<cmd>split<cr>", { desc = "Split Window Below", remap = true })
@@ -1363,7 +1365,6 @@ local function makespec_treesitter()
                 disable = function(lang, buf) return lang == "python" end,
             },
         },
-        init = function() vim.opt.foldexpr = "nvim_treesitter#foldexpr()" end,
     }
 end