new binds, monochromeHEADmaster

3 files changed, 29 insertions, 22 deletions

diff --git a/after/plugin/cfg.vim b/after/plugin/cfg.vim
index 1527a6f..c71ccb1 100644
--- a/after/plugin/cfg.vim
+++ b/after/plugin/cfg.vim
@@ -3,4 +3,4 @@ set autoindent
 set sw=4 ts=4 noet tw=80 cc=80
 set spr sb pb=12 winbl=12 nowrap ruler autoread
 set gfn=Hack:h10 noshowmode
-color oxocarbon
+colorscheme monochrome
diff --git a/after/plugin/fzf-lua.lua b/after/plugin/fzf-lua.lua
index d687fda..69e0742 100644
--- a/after/plugin/fzf-lua.lua
+++ b/after/plugin/fzf-lua.lua
@@ -1,2 +1,4 @@
+require('util').nn('<leader>b', '<cmd>FzfLua buffers<CR>')
+require('util').nn('<leader>fs', '<cmd>FzfLua lsp_workspace_symbols<CR>')
 require('util').nn('<leader>ff', '<cmd>FzfLua files<CR>')
 
diff --git a/after/plugin/lsp.lua b/after/plugin/lsp.lua
index 3f790d7..64cae8f 100644
--- a/after/plugin/lsp.lua
+++ b/after/plugin/lsp.lua
@@ -53,27 +53,32 @@ cmp.setup.cmdline(':', {
 	matching = { disallow_symbol_nonprefix_matching = false }
 })
 
-local function onattach(client, buf)
-	nn("gD", vim.lsp.buf.declaration)
-	nn("gd", vim.lsp.buf.definition)
-	nn("<Leader>K", vim.lsp.buf.hover)
-	nn("gi", vim.lsp.buf.implementation)
-	nn("<C-k>", vim.lsp.buf.signature_help)
-	nn("<Leader>D", vim.lsp.buf.type_definition)
-	nn("<Leader>r", vim.lsp.buf.rename)
-	nn("<Leader>A", vim.lsp.buf.code_action)
-	nn("<Leader>R", vim.lsp.buf.references)
-	nn("<Leader>f", vim.lsp.buf.format)
-end
-
-local caps = vim.lsp.protocol.make_client_capabilities()
-caps = cmp_lsp.default_capabilities(caps)
+vim.api.nvim_create_autocmd('LspAttach', {
+	callback = function(args)
+		nn("gD", vim.lsp.buf.declaration)
+		nn("gd", vim.lsp.buf.definition)
+		nn("<Leader>K", vim.lsp.buf.hover)
+		nn("gi", vim.lsp.buf.implementation)
+		nn("<C-k>", vim.lsp.buf.signature_help)
+		nn("<Leader>D", vim.lsp.buf.type_definition)
+		nn("<Leader>r", vim.lsp.buf.rename)
+		nn("<Leader>A", vim.lsp.buf.code_action)
+		nn("<Leader>R", vim.lsp.buf.references)
+		nn("<Leader>f", vim.lsp.buf.format)
+	end,
+})
 
-local servers = {'clangd', 'rust_analyzer', 'zls', 'texlab', 'biome'}
+local servers = {'clangd', 'rust_analyzer', 'zls', 'texlab', 'biome', 'tinymist'}
 for _, lsp in pairs(servers) do
-	lspconfig[lsp].setup {
-		capabilities = caps,
-		on_attach = onattach,
-		flags = { debounce_text_changes = 500 }
-	}
+	vim.lsp.enable(lsp)
 end
+
+vim.diagnostic.config({
+  virtual_text = false,
+  virtual_lines = true,
+  signs = true,
+  update_in_insert = false,
+  underline = true,
+  severity_sort = false,
+  float = true,
+})