aboutsummaryrefslogtreecommitdiffstats
path: root/nvim
diff options
context:
space:
mode:
Diffstat (limited to 'nvim')
-rw-r--r--nvim/.config/nvim/lua/plugins/conform.lua38
-rw-r--r--nvim/.config/nvim/lua/plugins/lsp.lua55
2 files changed, 44 insertions, 49 deletions
diff --git a/nvim/.config/nvim/lua/plugins/conform.lua b/nvim/.config/nvim/lua/plugins/conform.lua
index ee2777c..0f5af02 100644
--- a/nvim/.config/nvim/lua/plugins/conform.lua
+++ b/nvim/.config/nvim/lua/plugins/conform.lua
@@ -3,6 +3,7 @@ return {
'stevearc/conform.nvim',
event = { 'BufWritePre' },
cmd = { 'ConformInfo' },
+ lazy = false,
keys = {
{
'<leader>f',
@@ -12,6 +13,36 @@ return {
mode = '',
desc = '[F]ormat buffer',
},
+ {
+ '<leader>tf',
+ function()
+ -- If autoformat is currently disabled for this buffer,
+ -- then enable it, otherwise disable it
+ if vim.b.disable_autoformat then
+ vim.cmd 'FormatEnable'
+ vim.notify 'Enabled autoformat for current buffer'
+ else
+ vim.cmd 'FormatDisable!'
+ vim.notify 'Disabled autoformat for current buffer'
+ end
+ end,
+ desc = 'Toggle autoformat for current buffer',
+ },
+ {
+ '<leader>tF',
+ function()
+ -- If autoformat is currently disabled globally,
+ -- then enable it globally, otherwise disable it globally
+ if vim.g.disable_autoformat then
+ vim.cmd 'FormatEnable'
+ vim.notify 'Enabled autoformat globally'
+ else
+ vim.cmd 'FormatDisable'
+ vim.notify 'Disabled autoformat globally'
+ end
+ end,
+ desc = 'Toggle autoformat globally',
+ },
},
config = function()
vim.api.nvim_create_user_command('FormatDisable', function(args)
@@ -55,8 +86,13 @@ return {
formatters_by_ft = {
lua = { 'stylua' },
go = { 'goimports', 'gofmt' },
- python = { 'isort', 'black' },
+ python = { 'black' },
+ rust = { 'rustfmt' },
javascript = { 'prettierd', 'prettier', stop_after_first = true },
+ typescript = { 'prettierd', 'prettier', stop_after_first = true },
+ javascriptreact = { 'prettierd', 'prettier', stop_after_first = true },
+ typescriptreact = { 'prettierd', 'prettier', stop_after_first = true },
+ css = { 'prettierd', 'prettier', stop_after_first = true },
},
formatters = {
isort = {
diff --git a/nvim/.config/nvim/lua/plugins/lsp.lua b/nvim/.config/nvim/lua/plugins/lsp.lua
index 55fc34e..f7b9a2a 100644
--- a/nvim/.config/nvim/lua/plugins/lsp.lua
+++ b/nvim/.config/nvim/lua/plugins/lsp.lua
@@ -30,31 +30,6 @@ return {
'saghen/blink.cmp',
},
config = function()
- -- Brief aside: **What is LSP?**
- --
- -- LSP is an initialism you've probably heard, but might not understand what it is.
- --
- -- LSP stands for Language Server Protocol. It's a protocol that helps editors
- -- and language tooling communicate in a standardized fashion.
- --
- -- In general, you have a "server" which is some tool built to understand a particular
- -- language (such as `gopls`, `lua_ls`, `rust_analyzer`, etc.). These Language Servers
- -- (sometimes called LSP servers, but that's kind of like ATM Machine) are standalone
- -- processes that communicate with some "client" - in this case, Neovim!
- --
- -- LSP provides Neovim with features like:
- -- - Go to definition
- -- - Find references
- -- - Autocompletion
- -- - Symbol Search
- -- - and more!
- --
- -- Thus, Language Servers are external tools that must be installed separately from
- -- Neovim. This is where `mason` and related plugins come into play.
- --
- -- If you're wondering about lsp vs treesitter, you can check out the wonderfully
- -- and elegantly composed help section, `:help lsp-vs-treesitter`
-
-- This function gets run when an LSP attaches to a particular buffer.
-- That is to say, every time a new file is opened that is associated with
-- an lsp (for example, opening `main.rs` is associated with `rust_analyzer`) this
@@ -62,9 +37,6 @@ return {
vim.api.nvim_create_autocmd('LspAttach', {
group = vim.api.nvim_create_augroup('lsp-attach', { clear = true }),
callback = function(event)
- -- NOTE: Remember that Lua is a real programming language, and as such it is possible
- -- to define small helper and utility functions so you don't have to repeat yourself.
- --
-- In this case, we create a function that lets us more easily define mappings specific
-- for LSP related items. It sets the mode, buffer and description for us each time.
local map = function(keys, func, desc, mode)
@@ -109,19 +81,6 @@ return {
-- the definition of its *type*, not where it was *defined*.
map('grt', require('telescope.builtin').lsp_type_definitions, '[G]oto [T]ype Definition')
- -- This function resolves a difference between neovim nightly (version 0.11) and stable (version 0.10)
- ---@param client vim.lsp.Client
- ---@param method vim.lsp.protocol.Method
- ---@param bufnr? integer some lsp support methods only in specific files
- ---@return boolean
- local function client_supports_method(client, method, bufnr)
- if vim.fn.has 'nvim-0.11' == 1 then
- return client:supports_method(method, bufnr)
- else
- return client.supports_method(method, { bufnr = bufnr })
- end
- end
-
-- The following two autocommands are used to highlight references of the
-- word under your cursor when your cursor rests there for a little while.
-- See `:help CursorHold` for information about when this is executed
@@ -130,7 +89,7 @@ return {
local client = vim.lsp.get_client_by_id(event.data.client_id)
if
client
- and client_supports_method(client, vim.lsp.protocol.Methods.textDocument_documentHighlight, event.buf)
+ and client:supports_method(vim.lsp.protocol.Methods.textDocument_documentHighlight, event.buf)
then
local highlight_augroup = vim.api.nvim_create_augroup('lsp-highlight', { clear = false })
vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, {
@@ -158,7 +117,7 @@ return {
-- code, if the language server you are using supports them
--
-- This may be unwanted, since they displace some of your code
- if client and client_supports_method(client, vim.lsp.protocol.Methods.textDocument_inlayHint, event.buf) then
+ if client and client:supports_method(vim.lsp.protocol.Methods.textDocument_inlayHint, event.buf) then
map('<leader>th', function()
vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf })
end, '[T]oggle Inlay [H]ints')
@@ -196,13 +155,13 @@ return {
}
-- LSP servers and clients are able to communicate to each other what features they support.
- -- By default, Neovim doesn't support everything that is in the LSP specification.
- -- When you add blink.cmp, luasnip, etc. Neovim now has *more* capabilities.
- -- So, we create new capabilities with blink.cmp, and then broadcast that to the servers.
+ --
+ -- By default, Neovim doesn't support everything that is in the LSP specification.
+ -- When you add blink.cmp, luasnip, etc. Neovim now has *more* capabilities.
+ -- So, we create new capabilities with blink.cmp, and then broadcast that to the servers.
local capabilities = require('blink.cmp').get_lsp_capabilities()
- -- Enable the following language servers
- -- Feel free to add/remove any LSPs that you want here. They will automatically be installed.
+ -- Enable the following language servers. They will automatically be installed.
--
-- Add any additional override configuration in the following tables. Available keys are:
-- - cmd (table): Override the default command used to start the server