diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index a412520..e65962f 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -3,12 +3,11 @@ "buffer_manager.nvim": { "branch": "main", "commit": "4fa47504a23d9a94216f02b1d84f7b0a2dbe2b72" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "coq.artifacts": { "branch": "artifacts", "commit": "e7202d1a1b5cfa91446d5b7a035f915934e4d713" }, - "coq.thirdparty": { "branch": "3p", "commit": "f110ee91f1b2b897ab0026da347396756953ca41" }, - "coq_nvim": { "branch": "coq", "commit": "72df7bf4528ae8130e29b496aaecb4bfd8ab7c6b" }, "fidget.nvim": { "branch": "main", "commit": "eb9fccf7fda8b641814f31d47926202f229980b3" }, + "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, "gitsigns.nvim": { "branch": "main", "commit": "d195f0c35ced5174d3ecce1c4c8ebb3b5bc23fa9" }, "gruvbox.nvim": { "branch": "main", "commit": "f0e029a3989691eb38cfa9272b75251c62a00821" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, @@ -25,8 +24,10 @@ "nvim-surround": { "branch": "main", "commit": "633a0ab03159569a66b65671b0ffb1a6aed6cf18" }, "nvim-treesitter": { "branch": "master", "commit": "27f68c0b6a87cbad900b3d016425450af8268026" }, "nvim-ts-autotag": { "branch": "main", "commit": "8515e48a277a2f4947d91004d9aa92c29fdc5e18" }, + "nvim-ufo": { "branch": "main", "commit": "c6d88523f574024b788f1c3400c5d5b9bb1a0407" }, "nvim-web-devicons": { "branch": "master", "commit": "43aa2ddf476012a2155f5f969ee55ab17174da7a" }, "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, + "promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" }, "telescope-file-browser.nvim": { "branch": "master", "commit": "8e0543365fe5781c9babea7db89ef06bcff3716d" }, "telescope-symbols.nvim": { "branch": "master", "commit": "a6d0127a53d39b9fc2af75bd169d288166118aec" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, diff --git a/.config/nvim/lua/plugins/autocomplete.lua b/.config/nvim/lua/plugins/autocomplete.lua index 8f56695..4c0fc37 100644 --- a/.config/nvim/lua/plugins/autocomplete.lua +++ b/.config/nvim/lua/plugins/autocomplete.lua @@ -6,6 +6,7 @@ return { "hrsh7th/cmp-path", "hrsh7th/cmp-cmdline", "L3MON4D3/LuaSnip", + "rafamadriz/friendly-snippets", "saadparwaiz1/cmp_luasnip", }, config = function() diff --git a/.config/nvim/lua/plugins/colorscheme.lua b/.config/nvim/lua/plugins/colorscheme.lua index b3c85ed..bfb4095 100644 --- a/.config/nvim/lua/plugins/colorscheme.lua +++ b/.config/nvim/lua/plugins/colorscheme.lua @@ -48,4 +48,14 @@ return { -- require("vscode").load("dark") -- end -- } + + -- { + -- "sainnhe/everforest", + -- config = function() + -- vim.g.everforest_background = "hard" + -- vim.o.background = "dark" + -- -- require("everforest") + -- vim.cmd([[colorscheme everforest]]) + -- end + -- } } diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua index a65b8bd..b8cc5b5 100644 --- a/.config/nvim/lua/plugins/lsp.lua +++ b/.config/nvim/lua/plugins/lsp.lua @@ -6,43 +6,6 @@ return { }, opts = {} }, - { - "williamboman/mason-null-ls.nvim", - dependencies = { - "nvim-lua/plenary.nvim", - "nvimtools/none-ls.nvim", - }, - config = function() - local null_ls = require("null-ls") - null_ls.setup({ - source = { - -- null_ls.builtins.diagnostics.eslint_d, - -- null_ls.builtins.code_actions.eslint_d, - null_ls.builtins.diagnostics.stylelint, - null_ls.builtins.formatting.prettier, - null_ls.builtins.code_actions.gitsigns, - null_ls.builtins.formatting.autopep8, - null_ls.builtins.diagnostics.pycodestyle, - null_ls.builtins.diagnostics.pydocstyle, - }, - on_attach = function(client, bufnr) - if client.supports_method("textDocument/formatting") then - vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr }) - vim.api.nvim_create_autocmd("BufWritePre", { - group = vim.api.nvim_create_augroup("LspFormatting", {}), - buffer = bufnr, - callback = function() vim.lsp.buf.format({ async = false }) end, - }) - end - end, - }) - require("mason-null-ls").setup({ - ensure_installed = nil, - automatic_installation = true, - handlers = {} - }) - end - }, { "neovim/nvim-lspconfig", event = { "BufReadPre", "BufNewFile" }, @@ -53,7 +16,16 @@ return { keys = { { "lh", vim.lsp.buf.hover }, { "lr", vim.lsp.buf.rename }, - { "lf", function() vim.lsp.buf.format({async = true}) end}, + { "lf", function() + vim.lsp.buf.format({ + async = true, + bufnr = bufnr, + filter = function(client) + return client.name == "null-ls" + end + }) + end + }, { "lgr", vim.lsp.buf.references }, { "lgi", vim.lsp.buf.implementation }, { "lsh", vim.lsp.buf.signature_help }, @@ -91,25 +63,61 @@ return { local capabilities = require("cmp_nvim_lsp").default_capabilities() for _, server in pairs(LSP_SERVERS) do - if server ~= "tsserver" then - lspconfig[server].setup( - { - capabilities = capabilities, - on_attach = on_attach, - } - ) - end + lspconfig[server].setup( + { + capabilities = capabilities, + on_attach = on_attach, + } + ) end - lspconfig["tsserver"].setup( - { - capabilities = capabilities, - on_attach = function(client) - client.resolved_capabilities.document_formatting = false - end, - } - ) end, }, + { + "nvimtools/none-ls.nvim", + event = { "BufReadPre", "BufNewFile" }, + dependencies = { + "nvim-lua/plenary.nvim", + "williamboman/mason-null-ls.nvim", + }, + config = function() + local null_ls = require("null-ls") + null_ls.setup({ + source = { + -- null_ls.builtins.diagnostics.eslint_d, + -- null_ls.builtins.code_actions.eslint_d, + null_ls.builtins.diagnostics.stylelint, + null_ls.builtins.formatting.prettier, + null_ls.builtins.code_actions.gitsigns, + null_ls.builtins.formatting.autopep8, + null_ls.builtins.diagnostics.pycodestyle, + null_ls.builtins.diagnostics.pydocstyle, + }, + on_attach = function(client, bufnr) + if client.supports_method("textDocument/formatting") then + vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr }) + vim.api.nvim_create_autocmd("BufWritePre", { + group = vim.api.nvim_create_augroup("LspFormatting", {}), + buffer = bufnr, + callback = function() + vim.lsp.buf.format({ + async = false, + bufnr = bufnr, + filter = function(client) + return client.name == "null-ls" + end + }) + end, + }) + end + end, + }) + require("mason-null-ls").setup({ + ensure_installed = nil, + automatic_installation = true, + handlers = {} + }) + end + }, { "j-hui/fidget.nvim", opts = {} diff --git a/.config/nvim/lua/plugins/surround.lua b/.config/nvim/lua/plugins/surround.lua index de12c85..571889f 100644 --- a/.config/nvim/lua/plugins/surround.lua +++ b/.config/nvim/lua/plugins/surround.lua @@ -4,5 +4,17 @@ return { config = function() require("nvim-surround").setup() end + + -- insert = "s", + -- insert_line = "S", + -- normal = "ys", + -- normal_cur = "yss", + -- normal_line = "yS", + -- normal_cur_line = "ySS", + -- visual = "S", + -- visual_line = "gS", + -- delete = "ds", + -- change = "cs", + -- change_line = "cS", }, }