repos / dotfiles

commit

eb578e3

parent

0ef8a49

author

Eric Bower

date

2025-07-25 09:20:55 -0400 EDT

chore(nvim): more tweaks based on feedback in irc

 1@@ -20,7 +20,7 @@ local g = vim.g
 2 g.mapleader = ","
 3 g.maplocalleader = ","
 4 
 5-local opts = { noremap = true, silent = true }
 6+local opts = { silent = true }
 7 local map = vim.keymap.set
 8 map("n", "<leader>b", "<C-O>", opts) -- prev item in jumplist
 9 map("n", "Q", "<nop>", opts) -- disable "Q"
10@@ -36,16 +36,25 @@ map({ "n", "v", "i", "t" }, "<C-space><C-d>", function()
11 end)
12 map({ "n", "v" }, "<leader>gy", "<cmd>GitLink<cr>", opts)
13 
14+local augroup = vim.api.nvim_create_augroup("erock.cfg", { clear = true })
15 local autocmd = vim.api.nvim_create_autocmd
16-local augroup = vim.api.nvim_create_augroup
17-autocmd("Filetype", { pattern = { "qf" }, command = "setlocal wrap" })
18-autocmd("Filetype", { pattern = { "make" }, command = "setlocal tabstop=4 shiftwidth=4 softtabstop=4" })
19 autocmd("Filetype", {
20+  group = augroup,
21+  pattern = { "qf" },
22+  command = "setlocal wrap",
23+})
24+autocmd("Filetype", {
25+  group = augroup,
26+  pattern = { "make" },
27+  command = "setlocal tabstop=4 shiftwidth=4 softtabstop=4",
28+})
29+autocmd("Filetype", {
30+  group = augroup,
31 	pattern = { "markdown" },
32 	command = "setlocal wrap tw=79 formatoptions+=t tabstop=2 shiftwidth=2 softtabstop=2",
33 })
34 autocmd("FileType", {
35-	group = augroup("my.close_with_q", { clear = true }),
36+	group = augroup,
37 	pattern = { "help", "man", "qf", "scratch", "fugitive", "nvim-pack" },
38 	callback = function(args)
39 		map("n", "q", "<cmd>quit<cr>", { buffer = args.buf })
40@@ -77,7 +86,7 @@ local function setup_lsp()
41 	end
42 
43 	autocmd("LspAttach", {
44-		group = augroup("my.lsp", {}),
45+		group = augroup,
46 		callback = function(args)
47 			local client = assert(vim.lsp.get_client_by_id(args.data.client_id))
48 			if client:supports_method("textDocument/implementation") then
49@@ -159,7 +168,7 @@ local ts_parsers = {
50 local nts = require("nvim-treesitter")
51 nts.install(ts_parsers)
52 autocmd("PackChanged", { -- update treesitter parsers/queries with plugin updates
53-	group = augroup("my.pack", {}),
54+	group = augroup,
55 	callback = function(args)
56 		local spec = args.data.spec
57 		if spec and spec.name == "nvim-treesitter" and args.data.kind == "update" then
58@@ -171,12 +180,14 @@ autocmd("PackChanged", { -- update treesitter parsers/queries with plugin update
59 	end,
60 })
61 autocmd("FileType", { -- enable treesitter highlighting and indents
62-	group = augroup("my.treesitter", {}),
63+	group = augroup,
64 	callback = function(args)
65 		local filetype = args.match
66 		local lang = vim.treesitter.language.get_lang(filetype)
67 		if vim.treesitter.language.add(lang) then
68-			vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
69+      if vim.treesitter.query.get(filetype, "indents") then
70+			  vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
71+      end
72 			vim.treesitter.start()
73 		end
74 	end,