From 187886575e5f5fcf114c419d769119dd5f0c9060 Mon Sep 17 00:00:00 2001 From: Ian Forster Date: Sun, 19 Jan 2025 20:06:17 -0800 Subject: [PATCH 1/5] Updates --- lazyvim.json | 7 +++--- lua/iforster/plugins/formatting.lua | 38 +++++++++++++++++++++++++++++ lua/iforster/plugins/telescope.lua | 4 +-- 3 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 lua/iforster/plugins/formatting.lua diff --git a/lazyvim.json b/lazyvim.json index 861a95f..f3541fe 100644 --- a/lazyvim.json +++ b/lazyvim.json @@ -11,7 +11,8 @@ "lazyvim.plugins.extras.lang.yaml" ], "news": { - "NEWS.md": "6077" + "NEWS.md": "10960" }, - "version": 6 -} \ No newline at end of file + "version": 7 +} + diff --git a/lua/iforster/plugins/formatting.lua b/lua/iforster/plugins/formatting.lua new file mode 100644 index 0000000..f56802e --- /dev/null +++ b/lua/iforster/plugins/formatting.lua @@ -0,0 +1,38 @@ +return { + "stevearc/conform.nvim", + event = { "BufReadPre", "BufNewFile" }, + config = function() + local conform = require("conform") + + conform.setup({ + formatters_by_ft = { + javascript = { "prettier" }, + typescript = { "prettier" }, + javascriptreact = { "prettier" }, + typescriptreact = { "prettier" }, + svelte = { "prettier" }, + css = { "prettier" }, + html = { "prettier" }, + json = { "prettier" }, + yaml = { "prettier" }, + markdown = { "prettier" }, + graphql = { "prettier" }, + lua = { "stylua" }, + python = { "isort", "black" }, + }, + format_on_save = { + lsp_fallback = true, + async = false, + timeout_ms = 500, + }, + }) + + vim.keymap.set({ "n", "v" }, "mp", function() + conform.format({ + lsp_fallback = true, + async = false, + timeout_ms = 500, + }) + end, { desc = "Format file or range (in visual mode)" }) + end, +} diff --git a/lua/iforster/plugins/telescope.lua b/lua/iforster/plugins/telescope.lua index 4ccf361..97f45c0 100644 --- a/lua/iforster/plugins/telescope.lua +++ b/lua/iforster/plugins/telescope.lua @@ -30,13 +30,13 @@ return { [""] = actions.move_selection_previous, -- move to prev result [""] = actions.move_selection_next, -- move to next result [""] = actions.send_selected_to_qflist + custom_actions.open_trouble_qflist, - [""] = trouble_telescope.smart, + [""] = trouble_telescope.open, }, }, }, }) - telescope.load_extension("fzf") + -- telescope.load_extension("fzf") -- set keymaps local keymap = vim.keymap -- for conciseness From 45b2dd77766178ab45987557a4777cb525024b68 Mon Sep 17 00:00:00 2001 From: Ian Forster Date: Sun, 19 Jan 2025 20:10:23 -0800 Subject: [PATCH 2/5] remove format --- lua/iforster/plugins/formatting.lua | 38 ----------------------------- 1 file changed, 38 deletions(-) delete mode 100644 lua/iforster/plugins/formatting.lua diff --git a/lua/iforster/plugins/formatting.lua b/lua/iforster/plugins/formatting.lua deleted file mode 100644 index f56802e..0000000 --- a/lua/iforster/plugins/formatting.lua +++ /dev/null @@ -1,38 +0,0 @@ -return { - "stevearc/conform.nvim", - event = { "BufReadPre", "BufNewFile" }, - config = function() - local conform = require("conform") - - conform.setup({ - formatters_by_ft = { - javascript = { "prettier" }, - typescript = { "prettier" }, - javascriptreact = { "prettier" }, - typescriptreact = { "prettier" }, - svelte = { "prettier" }, - css = { "prettier" }, - html = { "prettier" }, - json = { "prettier" }, - yaml = { "prettier" }, - markdown = { "prettier" }, - graphql = { "prettier" }, - lua = { "stylua" }, - python = { "isort", "black" }, - }, - format_on_save = { - lsp_fallback = true, - async = false, - timeout_ms = 500, - }, - }) - - vim.keymap.set({ "n", "v" }, "mp", function() - conform.format({ - lsp_fallback = true, - async = false, - timeout_ms = 500, - }) - end, { desc = "Format file or range (in visual mode)" }) - end, -} From d7a6bd43eb68729371cac8d12469d8d9c3df88ff Mon Sep 17 00:00:00 2001 From: Ian Forster Date: Sun, 19 Jan 2025 20:20:58 -0800 Subject: [PATCH 3/5] comment out tsserver --- lua/iforster/plugins/lsp/mason.lua | 94 +++++++++++++++--------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/lua/iforster/plugins/lsp/mason.lua b/lua/iforster/plugins/lsp/mason.lua index 748229c..6719e5f 100644 --- a/lua/iforster/plugins/lsp/mason.lua +++ b/lua/iforster/plugins/lsp/mason.lua @@ -1,54 +1,54 @@ return { - "williamboman/mason.nvim", - dependencies = { - "williamboman/mason-lspconfig.nvim", - "WhoIsSethDaniel/mason-tool-installer.nvim", - }, - config = function() - -- import mason - local mason = require("mason") + "williamboman/mason.nvim", + dependencies = { + "williamboman/mason-lspconfig.nvim", + "WhoIsSethDaniel/mason-tool-installer.nvim", + }, + config = function() + -- import mason + local mason = require("mason") - -- import mason-lspconfig - local mason_lspconfig = require("mason-lspconfig") + -- import mason-lspconfig + local mason_lspconfig = require("mason-lspconfig") - local mason_tool_installer = require("mason-tool-installer") + local mason_tool_installer = require("mason-tool-installer") - -- enable mason and configure icons - mason.setup({ - ui = { - icons = { - package_installed = "✓", - package_pending = "➜", - package_uninstalled = "✗", - }, - }, - }) + -- enable mason and configure icons + mason.setup({ + ui = { + icons = { + package_installed = "✓", + package_pending = "➜", + package_uninstalled = "✗", + }, + }, + }) - mason_lspconfig.setup({ - -- list of servers for mason to install - ensure_installed = { - "tsserver", - "html", - "cssls", - "tailwindcss", - "svelte", - "lua_ls", - "graphql", - "emmet_ls", - "prismals", - "pyright", - }, - }) + mason_lspconfig.setup({ + -- list of servers for mason to install + ensure_installed = { + -- "tsserver", + "html", + "cssls", + "tailwindcss", + "svelte", + "lua_ls", + "graphql", + "emmet_ls", + "prismals", + "pyright", + }, + }) - mason_tool_installer.setup({ - ensure_installed = { - "prettier", -- prettier formatter - "stylua", -- lua formatter - "isort", -- python formatter - "black", -- python formatter - "pylint", - "eslint_d", - }, - }) - end, + mason_tool_installer.setup({ + ensure_installed = { + "prettier", -- prettier formatter + "stylua", -- lua formatter + "isort", -- python formatter + "black", -- python formatter + "pylint", + "eslint_d", + }, + }) + end, } From 747b4ecf36425de07f3ba6b1ccc2ff3e20a83f95 Mon Sep 17 00:00:00 2001 From: Ian Forster Date: Sat, 8 Feb 2025 21:26:49 -0800 Subject: [PATCH 4/5] Update to fix errors --- lua/iforster/lazy.lua | 57 ++--- lua/iforster/plugins/autopairs.lua | 49 +++-- lua/iforster/plugins/init.lua | 4 +- lua/iforster/plugins/lsp/lspconfig.lua | 280 ++++++++++++------------ lua/iforster/plugins/nvim-cmp.lua | 2 - lua/iforster/plugins/vim-tmux-navigator | 3 - 6 files changed, 201 insertions(+), 194 deletions(-) delete mode 100644 lua/iforster/plugins/vim-tmux-navigator diff --git a/lua/iforster/lazy.lua b/lua/iforster/lazy.lua index 71a7e0f..1b5ebfe 100644 --- a/lua/iforster/lazy.lua +++ b/lua/iforster/lazy.lua @@ -1,34 +1,35 @@ local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not vim.loop.fs_stat(lazypath) then - vim.fn.system({ - "git", - "clone", - "--filter=blob:none", - "https://github.com/folke/lazy.nvim.git", - "--branch=stable", -- latest stable release - lazypath, - }) + vim.fn.system({ + "git", + "clone", + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", -- latest stable release + lazypath, + }) end vim.opt.rtp:prepend(lazypath) -require("lazy").setup({ - spec = { - -- add LazyVim and import its plugins - { "LazyVim/LazyVim", import = "lazyvim.plugins" }, - { import = "iforster.plugins" }, - { import = "iforster.plugins.lsp" } }, - -- import any extras modules here - -- { import = "lazyvim.plugins.extras.lang.typescript" }, - -- { import = "lazyvim.plugins.extras.lang.json" }, - -- { import = "lazyvim.plugins.extras.ui.mini-animate" }, - -- import/override with your plugins - }, -{ - checker = { - enabled = true, - notify = false, - }, - change_detection = { - notify = false, - }, +require("lazy").setup({ + spec = { + -- add LazyVim and import its plugins + { "LazyVim/LazyVim", import = "lazyvim.plugins" }, + { import = "iforster.plugins" }, + { import = "iforster.plugins.lsp" }, + }, + + -- import any extras modules here + -- { import = "lazyvim.plugins.extras.lang.typescript" }, + -- { import = "lazyvim.plugins.extras.lang.json" }, + -- { import = "lazyvim.plugins.extras.ui.mini-animate" }, + -- import/override with your plugins +}, { + checker = { + enabled = true, + notify = false, + }, + change_detection = { + notify = false, + }, }) diff --git a/lua/iforster/plugins/autopairs.lua b/lua/iforster/plugins/autopairs.lua index 8ee54b3..58429aa 100644 --- a/lua/iforster/plugins/autopairs.lua +++ b/lua/iforster/plugins/autopairs.lua @@ -1,30 +1,31 @@ return { - "windwp/nvim-autopairs", - event = { "InsertEnter" }, - dependencies = { - "hrsh7th/nvim-cmp", - }, - config = function() - -- import nvim-autopairs - local autopairs = require("nvim-autopairs") + "windwp/nvim-autopairs", + "hrsh7th/nvim-cmp", + event = { "InsertEnter" }, + dependencies = { + "hrsh7th/nvim-cmp", + }, + config = function() + --import nvim-autopairs + local autopairs = require("nvim-autopairs") - -- configure autopairs - autopairs.setup({ - check_ts = true, -- enable treesitter - ts_config = { - lua = { "string" }, -- don't add pairs in lua string treesitter nodes - javascript = { "template_string" }, -- don't add pairs in javscript template_string treesitter nodes - java = false, -- don't check treesitter on java - }, - }) + -- configure autopairs + autopairs.setup({ + check_ts = true, -- enable treesitter + ts_config = { + lua = { "string" }, -- don't add pairs in lua string treesitter nodes + javascript = { "template_string" }, -- don't add pairs in javscript template_string treesitter nodes + java = false, -- don't check treesitter on java + }, + }) - -- import nvim-autopairs completion functionality - local cmp_autopairs = require("nvim-autopairs.completion.cmp") + -- import nvim-autopairs completion functionality + local cmp_autopairs = require("nvim-autopairs.completion.cmp") - -- import nvim-cmp plugin (completions plugin) - local cmp = require("cmp") + -- import nvim-cmp plugin (completions plugin) + local cmp = require("cmp") - -- make autopairs and completion work together - cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done()) - end, + -- make autopairs and completion work together + cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done()) + end, } diff --git a/lua/iforster/plugins/init.lua b/lua/iforster/plugins/init.lua index a885d95..b22f6fb 100644 --- a/lua/iforster/plugins/init.lua +++ b/lua/iforster/plugins/init.lua @@ -1,4 +1,4 @@ return { - "nvim-lua/plenary.nvim", -- lua functions that many plugins use - "christoomey/vim-tmux-navigator", -- tmux & split window navigation + "nvim-lua/plenary.nvim", -- lua functions that many plugins use + "christoomey/vim-tmux-navigator", -- tmux & split window navigation } diff --git a/lua/iforster/plugins/lsp/lspconfig.lua b/lua/iforster/plugins/lsp/lspconfig.lua index 00da4bf..6a88d74 100644 --- a/lua/iforster/plugins/lsp/lspconfig.lua +++ b/lua/iforster/plugins/lsp/lspconfig.lua @@ -1,137 +1,147 @@ return { - "neovim/nvim-lspconfig", - event = { "BufReadPre", "BufNewFile" }, - dependencies = { - "hrsh7th/cmp-nvim-lsp", - { "antosha417/nvim-lsp-file-operations", config = true }, - { "folke/neodev.nvim", opts = {} }, - }, - config = function() - -- import lspconfig plugin - local lspconfig = require("lspconfig") - - -- import mason_lspconfig plugin - local mason_lspconfig = require("mason-lspconfig") - - -- import cmp-nvim-lsp plugin - local cmp_nvim_lsp = require("cmp_nvim_lsp") - - local keymap = vim.keymap -- for conciseness - - vim.api.nvim_create_autocmd("LspAttach", { - group = vim.api.nvim_create_augroup("UserLspConfig", {}), - callback = function(ev) - -- Buffer local mappings. - -- See `:help vim.lsp.*` for documentation on any of the below functions - local opts = { buffer = ev.buf, silent = true } - - -- set keybinds - opts.desc = "Show LSP references" - keymap.set("n", "gR", "Telescope lsp_references", opts) -- show definition, references - - opts.desc = "Go to declaration" - keymap.set("n", "gD", vim.lsp.buf.declaration, opts) -- go to declaration - - opts.desc = "Show LSP definitions" - keymap.set("n", "gd", "Telescope lsp_definitions", opts) -- show lsp definitions - - opts.desc = "Show LSP implementations" - keymap.set("n", "gi", "Telescope lsp_implementations", opts) -- show lsp implementations - - opts.desc = "Show LSP type definitions" - keymap.set("n", "gt", "Telescope lsp_type_definitions", opts) -- show lsp type definitions - - opts.desc = "See available code actions" - keymap.set({ "n", "v" }, "ca", vim.lsp.buf.code_action, opts) -- see available code actions, in visual mode will apply to selection - - opts.desc = "Smart rename" - keymap.set("n", "rn", vim.lsp.buf.rename, opts) -- smart rename - - opts.desc = "Show buffer diagnostics" - keymap.set("n", "D", "Telescope diagnostics bufnr=0", opts) -- show diagnostics for file - - opts.desc = "Show line diagnostics" - keymap.set("n", "d", vim.diagnostic.open_float, opts) -- show diagnostics for line - - opts.desc = "Go to previous diagnostic" - keymap.set("n", "[d", vim.diagnostic.goto_prev, opts) -- jump to previous diagnostic in buffer - - opts.desc = "Go to next diagnostic" - keymap.set("n", "]d", vim.diagnostic.goto_next, opts) -- jump to next diagnostic in buffer - - opts.desc = "Show documentation for what is under cursor" - keymap.set("n", "K", vim.lsp.buf.hover, opts) -- show documentation for what is under cursor - - opts.desc = "Restart LSP" - keymap.set("n", "rs", ":LspRestart", opts) -- mapping to restart lsp if necessary - end, - }) - - -- used to enable autocompletion (assign to every lsp server config) - local capabilities = cmp_nvim_lsp.default_capabilities() - - -- Change the Diagnostic symbols in the sign column (gutter) - -- (not in youtube nvim video) - local signs = { Error = " ", Warn = " ", Hint = "󰠠 ", Info = " " } - for type, icon in pairs(signs) do - local hl = "DiagnosticSign" .. type - vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" }) - end - - mason_lspconfig.setup_handlers({ - -- default handler for installed servers - function(server_name) - lspconfig[server_name].setup({ - capabilities = capabilities, - }) - end, - ["svelte"] = function() - -- configure svelte server - lspconfig["svelte"].setup({ - capabilities = capabilities, - on_attach = function(client, bufnr) - vim.api.nvim_create_autocmd("BufWritePost", { - pattern = { "*.js", "*.ts" }, - callback = function(ctx) - -- Here use ctx.match instead of ctx.file - client.notify("$/onDidChangeTsOrJsFile", { uri = ctx.match }) - end, - }) - end, - }) - end, - ["graphql"] = function() - -- configure graphql language server - lspconfig["graphql"].setup({ - capabilities = capabilities, - filetypes = { "graphql", "gql", "svelte", "typescriptreact", "javascriptreact" }, - }) - end, - ["emmet_ls"] = function() - -- configure emmet language server - lspconfig["emmet_ls"].setup({ - capabilities = capabilities, - filetypes = { "html", "typescriptreact", "javascriptreact", "css", "sass", "scss", "less", "svelte" }, - }) - end, - ["lua_ls"] = function() - -- configure lua server (with special settings) - lspconfig["lua_ls"].setup({ - capabilities = capabilities, - settings = { - Lua = { - -- make the language server recognize "vim" global - diagnostics = { - globals = { "vim" }, - }, - completion = { - callSnippet = "Replace", - }, - }, - }, - }) - end, - }) - end, + "neovim/nvim-lspconfig", + event = { "BufReadPre", "BufNewFile" }, + dependencies = { + "hrsh7th/cmp-nvim-lsp", + { "antosha417/nvim-lsp-file-operations", config = true }, + { "folke/neodev.nvim", opts = {} }, + }, + config = function() + -- import lspconfig plugin + local lspconfig = require("lspconfig") + local cmp = require('cmp'), + + + -- import mason_lspconfig plugin + local mason_lspconfig = require("mason-lspconfig") + + -- import cmp-nvim-lsp plugin + local cmp_nvim_lsp = require("cmp_nvim_lsp") + + local keymap = vim.keymap -- for conciseness + + vim.api.nvim_create_autocmd("LspAttach", { + group = vim.api.nvim_create_augroup("UserLspConfig", {}), + callback = function(ev) + -- Buffer local mappings. + -- See `:help vim.lsp.*` for documentation on any of the below functions + local opts = { buffer = ev.buf, silent = true } + + -- set keybinds + opts.desc = "Show LSP references" + keymap.set("n", "gR", "Telescope lsp_references", opts) -- show definition, references + + opts.desc = "Go to declaration" + keymap.set("n", "gD", vim.lsp.buf.declaration, opts) -- go to declaration + + opts.desc = "Show LSP definitions" + keymap.set("n", "gd", "Telescope lsp_definitions", opts) -- show lsp definitions + + opts.desc = "Show LSP implementations" + keymap.set("n", "gi", "Telescope lsp_implementations", opts) -- show lsp implementations + + opts.desc = "Show LSP type definitions" + keymap.set("n", "gt", "Telescope lsp_type_definitions", opts) -- show lsp type definitions + + opts.desc = "See available code actions" + keymap.set({ "n", "v" }, "ca", vim.lsp.buf.code_action, opts) -- see available code actions, in visual mode will apply to selection + + opts.desc = "Smart rename" + keymap.set("n", "rn", vim.lsp.buf.rename, opts) -- smart rename + + opts.desc = "Show buffer diagnostics" + keymap.set("n", "D", "Telescope diagnostics bufnr=0", opts) -- show diagnostics for file + + opts.desc = "Show line diagnostics" + keymap.set("n", "d", vim.diagnostic.open_float, opts) -- show diagnostics for line + + opts.desc = "Go to previous diagnostic" + keymap.set("n", "[d", vim.diagnostic.goto_prev, opts) -- jump to previous diagnostic in buffer + + opts.desc = "Go to next diagnostic" + keymap.set("n", "]d", vim.diagnostic.goto_next, opts) -- jump to next diagnostic in buffer + + opts.desc = "Show documentation for what is under cursor" + keymap.set("n", "K", vim.lsp.buf.hover, opts) -- show documentation for what is under cursor + + opts.desc = "Restart LSP" + keymap.set("n", "rs", ":LspRestart", opts) -- mapping to restart lsp if necessary + end, + }) + + -- used to enable autocompletion (assign to every lsp server config) + local capabilities = cmp_nvim_lsp.default_capabilities() + + -- Change the Diagnostic symbols in the sign column (gutter) + -- (not in youtube nvim video) + local signs = { Error = " ", Warn = " ", Hint = "󰠠 ", Info = " " } + for type, icon in pairs(signs) do + local hl = "DiagnosticSign" .. type + vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" }) + end + + mason_lspconfig.setup_handlers({ + -- default handler for installed servers + function(server_name) + lspconfig[server_name].setup({ + capabilities = capabilities, + }) + end, + ["svelte"] = function() + -- configure svelte server + lspconfig["svelte"].setup({ + capabilities = capabilities, + on_attach = function(client, bufnr) + vim.api.nvim_create_autocmd("BufWritePost", { + pattern = { "*.js", "*.ts" }, + callback = function(ctx) + -- Here use ctx.match instead of ctx.file + client.notify("$/onDidChangeTsOrJsFile", { uri = ctx.match }) + end, + }) + end, + }) + end, + ["graphql"] = function() + -- configure graphql language server + lspconfig["graphql"].setup({ + capabilities = capabilities, + filetypes = { "graphql", "gql", "svelte", "typescriptreact", "javascriptreact" }, + }) + end, + ["emmet_ls"] = function() + -- configure emmet language server + lspconfig["emmet_ls"].setup({ + capabilities = capabilities, + filetypes = { + "html", + "typescriptreact", + "javascriptreact", + "css", + "sass", + "scss", + "less", + "svelte", + }, + }) + end, + ["lua_ls"] = function() + -- configure lua server (with special settings) + lspconfig["lua_ls"].setup({ + capabilities = capabilities, + settings = { + Lua = { + -- make the language server recognize "vim" global + diagnostics = { + globals = { "vim" }, + }, + completion = { + callSnippet = "Replace", + }, + }, + }, + }) + end, + }) + end, } - diff --git a/lua/iforster/plugins/nvim-cmp.lua b/lua/iforster/plugins/nvim-cmp.lua index 71d68de..25908e7 100644 --- a/lua/iforster/plugins/nvim-cmp.lua +++ b/lua/iforster/plugins/nvim-cmp.lua @@ -17,9 +17,7 @@ return { }, config = function() local cmp = require("cmp") - local luasnip = require("luasnip") - local lspkind = require("lspkind") -- loads vscode style snippets from installed plugins (e.g. friendly-snippets) diff --git a/lua/iforster/plugins/vim-tmux-navigator b/lua/iforster/plugins/vim-tmux-navigator deleted file mode 100644 index b95e443..0000000 --- a/lua/iforster/plugins/vim-tmux-navigator +++ /dev/null @@ -1,3 +0,0 @@ -return { - "christoomey/vim-tmux-navigator", -- tmux & split window navigation -} From 8eea63d8327020eb757ed71cb831ff328d685dcc Mon Sep 17 00:00:00 2001 From: Ian Forster Date: Sat, 8 Feb 2025 21:27:24 -0800 Subject: [PATCH 5/5] Add file back --- lua/iforster/plugins/vim-tmux-navigator | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 lua/iforster/plugins/vim-tmux-navigator diff --git a/lua/iforster/plugins/vim-tmux-navigator b/lua/iforster/plugins/vim-tmux-navigator new file mode 100644 index 0000000..b95e443 --- /dev/null +++ b/lua/iforster/plugins/vim-tmux-navigator @@ -0,0 +1,3 @@ +return { + "christoomey/vim-tmux-navigator", -- tmux & split window navigation +}