repos / dotfiles

commit

b13fe3d

parent

25fb392

author

Eric Bower

date

2025-08-14 13:33:25 -0400 EDT

chore(nvim): remove custom shortcuts for lsp

  1@@ -8,7 +8,6 @@
  2     - use default keybindings unless painful otherwise
  3     - plugins must be integral to workflow
  4 ]]
  5-
  6 local o = vim.opt
  7 o.tabstop = 2
  8 o.shiftwidth = 2
  9@@ -34,9 +33,7 @@ vim.g.maplocalleader = ","
 10 local opts = { silent = true }
 11 local map = vim.keymap.set
 12 map("n", "<leader>t", ":bd<CR>", opts)
 13-map("n", "<leader>b", "<C-O>", opts) -- move to prev item in jumplist
 14 map("n", "Q", "<nop>", opts) -- disable "Q"
 15-map("n", "<leader>w", ":!make fmt<CR>", opts) -- code format command
 16 map("t", "<Esc>", [[<C-\><C-n>]], opts) -- exit terminal mode
 17 map("n", "<C-k>", ":wincmd k<CR>", opts) -- navigate splits
 18 map("n", "<C-j>", ":wincmd j<CR>", opts)
 19@@ -54,21 +51,11 @@ end, opts)
 20 
 21 local augroup = vim.api.nvim_create_augroup("erock.cfg", { clear = true })
 22 local autocmd = vim.api.nvim_create_autocmd
 23-autocmd("Filetype", {
 24-	group = augroup,
 25-	pattern = { "qf" },
 26-	command = "setlocal wrap",
 27-})
 28-autocmd("Filetype", {
 29-	group = augroup,
 30-	pattern = { "make" },
 31-	command = "setlocal tabstop=4 shiftwidth=4 softtabstop=4",
 32-})
 33-autocmd("Filetype", {
 34-	group = augroup,
 35-	pattern = { "markdown" },
 36-	command = "setlocal wrap tw=79 formatoptions+=t tabstop=2 shiftwidth=2 softtabstop=2",
 37-})
 38+local makewrap = "setlocal tabstop=4 shiftwidth=4 softtabstop=4"
 39+local mdwrap = "setlocal wrap tw=79 formatoptions+=t tabstop=2 shiftwidth=2 softtabstop=2"
 40+autocmd("Filetype", { group = augroup, pattern = { "qf" }, command = "setlocal wrap" })
 41+autocmd("Filetype", { group = augroup, pattern = { "make" }, command = makewrap })
 42+autocmd("Filetype", { group = augroup, pattern = { "markdown" }, command = mdwrap })
 43 
 44 local function setup_lsp()
 45 	map("n", "<leader>e", vim.diagnostic.open_float, opts)
 46@@ -84,27 +71,14 @@ local function setup_lsp()
 47 		"ts_ls", -- npm i -g typescript typescript-language-server
 48 	})
 49 
 50-	-- local chars = {} -- trigger autocompletion on EVERY keypress
 51-	-- for i = 32, 126 do
 52-	-- 	table.insert(chars, string.char(i))
 53-	-- end
 54-
 55 	autocmd("LspAttach", {
 56 		group = augroup,
 57 		callback = function(args)
 58 			local client = assert(vim.lsp.get_client_by_id(args.data.client_id))
 59-			if client:supports_method("textDocument/implementation") then
 60-				local bufopts = { noremap = true, silent = true, buffer = args.buf }
 61-				map("n", "<leader>d", vim.lsp.buf.definition, bufopts)
 62-				map("n", "<leader>D", vim.lsp.buf.type_definition, bufopts)
 63-				map("n", "<leader>h", vim.lsp.buf.hover, bufopts)
 64-				map("n", "<leader>r", vim.lsp.buf.references, bufopts)
 65-				map("n", "<leader>i", vim.lsp.buf.implementation, bufopts)
 66-				map("i", "<C-k>", vim.lsp.completion.get, bufopts) -- open completion menu manually
 67-			end
 68+			local bufopts = { noremap = true, silent = true, buffer = args.buf }
 69+			map("i", "<C-k>", vim.lsp.completion.get, bufopts) -- open completion menu manually
 70 
 71 			if client:supports_method("textDocument/completion") then
 72-				-- client.server_capabilities.completionProvider.triggerCharacters = chars
 73 				vim.lsp.completion.enable(true, client.id, args.buf, { autotrigger = true })
 74 			end
 75 		end,
 76@@ -113,16 +87,22 @@ end
 77 
 78 local function setup_fzf()
 79 	local fzf = require("fzf-lua")
 80+	local noprev = { winopts = { preview = { hidden = "hidden" } } }
 81 	local fzf_files = function()
 82-		fzf.files({ winopts = { preview = { hidden = "hidden" } } })
 83+		fzf.files(noprev)
 84 	end
 85 	local fzf_symbols = function()
 86-		fzf.lsp_document_symbols({ winopts = { preview = { hidden = "hidden" } } })
 87+		fzf.lsp_document_symbols(noprev)
 88+	end
 89+	local fzf_buffers = function()
 90+		fzf.buffer(noprev)
 91 	end
 92-	map("n", "<leader>s", fzf_files, { desc = "Fzf Files", noremap = true, silent = true })
 93-	map("n", "<leader>F", fzf_symbols, { desc = "Fzf Symbols", noremap = true, silent = true })
 94-	map("n", "<leader>f", fzf.buffers, { desc = "Fzf Buffers", noremap = true, silent = true })
 95-	map("n", "<leader>S", fzf.live_grep, { desc = "Fzf Grep", noremap = true, silent = true })
 96+	map("n", "<leader>s", fzf_files, { desc = "fzf files", noremap = true, silent = true })
 97+	map("n", "<leader>F", fzf_symbols, { desc = "fzf symbols", noremap = true, silent = true })
 98+	map("n", "<leader>f", fzf_buffers, { desc = "fzf buffers", noremap = true, silent = true })
 99+	map("n", "<leader>S", fzf.live_grep, { desc = "fzf grep", noremap = true, silent = true })
100+	map("n", "<leader>j", fzf.jumps, { desc = "fzf jumplist", noremap = true, silent = true })
101+	map("n", "<leader>m", fzf.marks, { desc = "fzf marks", noremap = true, silent = true })
102 	fzf.setup({ "max-perf" })
103 end
104