diff --git a/lazy-lock.json b/lazy-lock.json index 7061209..5fcb779 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,49 +1,49 @@ { - "LuaSnip": { "branch": "master", "commit": "0d469d83bf4fd90e3420998159012859d694152b" }, + "LuaSnip": { "branch": "master", "commit": "dae4f5aaa3574bd0c2b9dd20fb9542a02c10471c" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, - "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, - "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" }, + "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" }, + "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "colorful-winsep.nvim": { "branch": "alpha", "commit": "7bbe4e1353c0fe37c98bad2758aafc410280f6b3" }, "emoji.nvim": { "branch": "main", "commit": "5c68359b56d2470583832b6b2b559566c5b39dc8" }, - "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" }, - "fzf-lua": { "branch": "main", "commit": "fe71a7c072e98e43d448d8d198595ee9ebdcb27a" }, - "gitsigns.nvim": { "branch": "main", "commit": "1796c7cedfe7e5dd20096c5d7b8b753d8f8d22eb" }, - "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" }, - "hererocks": { "branch": "master", "commit": "c9c5444dea1e07e005484014a8231aa667be30b6" }, + "fidget.nvim": { "branch": "main", "commit": "7fa433a83118a70fe24c1ce88d5f0bd3453c0970" }, + "fzf-lua": { "branch": "main", "commit": "21b9acfdb6c8b423338a20f57664209809cd033f" }, + "gitsigns.nvim": { "branch": "main", "commit": "abf82a65f185bd54adc0679f74b7d6e1ada690c9" }, + "harpoon": { "branch": "harpoon2", "commit": "87b1a3506211538f460786c23f98ec63ad9af4e5" }, + "hererocks": { "branch": "master", "commit": "3856f1b4fb69a9f683f1eb146a4cd49a67478419" }, "jest.nvim": { "branch": "master", "commit": "1ec13b863512f3673116986e6d27dc49bc17b829" }, - "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, - "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, - "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, - "mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" }, - "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, - "mini.comment": { "branch": "main", "commit": "fb867a9246f9b892cf51a8c84a3f8479cdf1558c" }, - "mini.icons": { "branch": "main", "commit": "ff2e4f1d29f659cc2bad0f9256f2f6195c6b2428" }, - "mini.indentscope": { "branch": "main", "commit": "8af2569a7d7fd37300dfa760e44e71efbbf322fd" }, - "mini.move": { "branch": "main", "commit": "4fe4a855fee53c66b0f3255a4b54ddc2ae6b308c" }, - "mini.pairs": { "branch": "main", "commit": "69864a2efb36c030877421634487fd90db1e4298" }, - "mini.surround": { "branch": "main", "commit": "5aab42fcdcf31fa010f012771eda5631c077840a" }, - "none-ls.nvim": { "branch": "main", "commit": "7c493a266a6b1ed419f8a2e431651bc15b10df27" }, - "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" }, - "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, + "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, + "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" }, + "lspkind.nvim": { "branch": "master", "commit": "dbac5149fb5fb1b642266ff268b1e0f4ebac9293" }, + "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "4823a251e7578a835bb979c37df390fca692ba39" }, + "mason-null-ls.nvim": { "branch": "main", "commit": "8e7806acaa87fae64f0bfde25bb4b87c18bd19b4" }, + "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" }, + "mini.comment": { "branch": "main", "commit": "a0c721115faff8d05505c0a12dab410084d9e536" }, + "mini.icons": { "branch": "main", "commit": "efc85e42262cd0c9e1fdbf806c25cb0be6de115c" }, + "mini.indentscope": { "branch": "main", "commit": "0308f949f31769e509696af5d5f91cebb2159c69" }, + "mini.move": { "branch": "main", "commit": "4d214202d71e0a4066b6288176bbe88f268f9777" }, + "mini.pairs": { "branch": "main", "commit": "4089aa6ea6423e02e1a8326a7a7a00159f6f5e04" }, + "mini.surround": { "branch": "main", "commit": "f9358544ed06bc10197e698b7fc8dc5963be3f4b" }, + "none-ls.nvim": { "branch": "main", "commit": "3c206dfedf5f1385e9d29f85ffaec7874358592a" }, + "nvim-autopairs": { "branch": "master", "commit": "c2a0dd0d931d0fb07665e1fedb1ea688da3b80b4" }, + "nvim-cmp": { "branch": "main", "commit": "da88697d7f45d16852c6b2769dc52387d1ddc45f" }, "nvim-jenkinsfile-linter": { "branch": "main", "commit": "4bd761597348df2700dc456d870a1a5501448df2" }, - "nvim-lspconfig": { "branch": "master", "commit": "1b801f68d09e70e59e6dd967b663b6d84ee3e87d" }, - "nvim-tree.lua": { "branch": "master", "commit": "582ae48c9e43d2bcd55dfcc8e2e7a1f29065d924" }, - "nvim-treesitter": { "branch": "master", "commit": "94ea4f436d2b59c80f02e293466c374584f03b8c" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "ed373482db797bbf71bdff37a15c7555a84dce47" }, - "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, + "nvim-lspconfig": { "branch": "master", "commit": "419b082102fa813739588dd82e19a8b6b2442855" }, + "nvim-tree.lua": { "branch": "master", "commit": "1701e41b07d398757101ac35e11d6992085fc75f" }, + "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" }, + "nvim-ts-autotag": { "branch": "main", "commit": "db15f2e0df2f5db916e511e3fffb682ef2f6354f" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" }, - "nvim-web-devicons": { "branch": "master", "commit": "2c2b4eafce6cdd0cb165036faa17396eff18f847" }, - "plenary": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, - "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, - "telescope-file-browser.nvim": { "branch": "master", "commit": "626998e5c1b71c130d8bc6cf7abb6709b98287bb" }, - "telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" }, - "vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" }, + "nvim-web-devicons": { "branch": "master", "commit": "803353450c374192393f5387b6a0176d0972b848" }, + "plenary": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "telescope-file-browser.nvim": { "branch": "master", "commit": "3610dc7dc91f06aa98b11dca5cc30dfa98626b7e" }, + "telescope.nvim": { "branch": "master", "commit": "ad7d9580338354ccc136e5b8f0aa4f880434dcdc" }, + "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" }, "vim-haproxy": { "branch": "master", "commit": "1d93a843b4c567c2f499ba0c7ed60c435109ee53" }, - "vscode": { "branch": "main", "commit": "5769f298af4abf371528b25623fecb1e069c858c" }, - "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }, + "vscode": { "branch": "main", "commit": "aa1102a7e15195c9cca22730b09224a7f7745ba8" }, + "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }, "winbar.nvim": { "branch": "main", "commit": "13739fdb31be51a1000486189662596f07a59a31" } } diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua deleted file mode 100644 index daa408b..0000000 --- a/lua/plugins/cmp.lua +++ /dev/null @@ -1,91 +0,0 @@ --- print('test') - -local enabled_lsps = { - "pyright", - "tsserver", - "clangd", - "gopls", - "rust_analyzer", - "taplo", - "graphql" -} - -return { --- "L3MON4D3/LuaSnip", --- { - "hrsh7th/nvim-cmp", - - event = 'InsertEnter', - - dependencies = { - 'hrsh7th/cmp-nvim-lsp', - 'L3MON4D3/LuaSnip', - 'saadparwaiz1/cmp_luasnip', - }, - - config = function() - local cmp = require'cmp' - local ls = require('luasnip') - - cmp.setup({ - snippets = { - expand = function(args) - ls.lsp_expand(args.body) - end, - }, - sources = { - { name = 'luasnip' }, - }, - }) - end, --- }, --- 'saadparwaiz1/cmp_luasnip', - - --- config = function() --- --- end, --- --- config = function() --- local cmp = require('cmp') --- --- cmp.setup({ --- snippet = { --- expand = function(args) --- vim.fn["luasnip#anonymous"](args.body) --- end, --- }, --- window = { --- completion = cmp.config.window.bordered(), --- documentation = cmp.config.window.bordered(), --- }, --- mapping = cmp.mapping.preset.insert({ --- [''] = cmp.mapping.scroll_docs(-4), --- [''] = cmp.mapping.scroll_docs(4), --- [''] = cmp.mapping.complete(), --- [''] = cmp.config.disable, --- [''] = cmp.mapping({ --- i = cmp.mapping.abort(), --- c = cmp.mapping.close(), --- }), --- [''] = cmp.mapping.confirm({ select = true }), --- }), --- sources = cmp.config.sources({ --- { name = 'nvim_lsp' }, --- { name = 'luasnip' }, --- }, { --- { name = 'buffer' }, --- }) --- }) --- --- end, --- --- build = function() --- local lspconfig = require('lspconfig') --- for i, lsp in ipairs(enabled_lsps) do --- lspconfig[lsp].setup({ --- capabilities = capabilities --- }) --- end --- end, -} diff --git a/lua/plugins/harpoon.lua b/lua/plugins/harpoon.lua deleted file mode 100644 index e67ebc6..0000000 --- a/lua/plugins/harpoon.lua +++ /dev/null @@ -1,6 +0,0 @@ --- lua/plugins/harpoon.lua --- print('harpoon.lua loaded') - -return { - "ThePrimeagen/harpoon", -} diff --git a/lua/plugins/indent_blankline.lua b/lua/plugins/indent_blankline.lua deleted file mode 100644 index 7b495d9..0000000 --- a/lua/plugins/indent_blankline.lua +++ /dev/null @@ -1,5 +0,0 @@ --- lua/plugins/indent-blankline.lua - -return { - "lukas-reineke/indent-blankline.nvim", -} diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua deleted file mode 100644 index 667f850..0000000 --- a/lua/plugins/lsp.lua +++ /dev/null @@ -1,44 +0,0 @@ --- lua/plugins/lsp.lua --- print('lsp.lua loaded') - -return { - "neovim/nvim-lspconfig", - lazy = false, - priority = 900, - - dependencies = { - "williamboman/mason.nvim", - "williamboman/mason-lspconfig.nvim", - }, - - config = function() - local lspconfig = require("lspconfig") - local mason = require("mason") - local masonlsp = require("mason-lspconfig") - - mason.setup() - masonlsp.setup() --- lspconfig.setup({}) - - lspconfig.pyright.setup({}) - lspconfig.tsserver.setup({}) - lspconfig.clangd.setup({}) - lspconfig.gopls.setup({}) - lspconfig.rust_analyzer.setup({}) - lspconfig.taplo.setup({}) - lspconfig.graphql.setup({}) - lspconfig.lua_ls.setup({ - settings = { - diagnostics = { - global = { - 'vim', - 'require' - }, - }, - }, - }) - lspconfig.vimls.setup({}) --- lspconfig.rust_analyzer.setup({}) --- lspconfig.lua_ls.setup({}) - end, -} diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua deleted file mode 100644 index d81ce0b..0000000 --- a/lua/plugins/lualine.lua +++ /dev/null @@ -1,108 +0,0 @@ --- lua/plugins/lualine.lua - -return { - "nvim-lualine/lualine.nvim", - - dependencies = { - "nvim-tree/nvim-web-devicons", - }, - - config = function() - local lualine = require('lualine') - lualine.setup({ - options = { - theme = 'auto', - -- fmt = default, - -- fmt = string.upper, - - ignore_focus = { - - }, - - refresh = { - statusline = 100, - tabline = 100, - winbar = 100, - }, - }, - sections = { - lualine_a = { --- { --- 'windows' --- }, - { - 'diff', - colored = true, - diff_color = { - added = 'LuaLineDiffAdd', - modified = 'LuaLineDiffChange', - removed = 'LuaLineDiffDelete', - }, - }, --- { --- 'buffers', --- show_filename_only = true, --- show_modified_status = false, --- --- mode = 4, --- --- filetype_names = { --- NvimTree = 'NvimTree' --- }, --- }, - { - 'mode', - fmt = function(str) return '[' .. str:sub(1,1) .. ']' end, - }, - }, - lualine_b = { - { 'branch' } - }, - lualine_c = { - { - 'filename', - file_status = true, - newfile_status = false, - path = 0, - fmt = string.lower, - shorting_target = 40, - - symbols = { - modified = '[+]', - readonly = '[-]', - unamed = '[No Name]', - newfile = '[New]', - }, - } - }, - lualine_x = { - { - require("lazy.status").updates, - cond = require("lazy.status").has_updates, - color = { fg = "#ff9e64" }, - }, - { - 'encoding' - }, - { - 'filetype', - colored = true, - icons_enabled = true, - icon_only = true, - icon = { align='center' } - } - }, - lualine_y = { - { - 'progress', - }, - }, - lualine_z = { - { - 'location', - }, - }, - }, - }) - end, -} diff --git a/lua/plugins/nvimtree.lua b/lua/plugins/nvimtree.lua deleted file mode 100644 index 83aaec8..0000000 --- a/lua/plugins/nvimtree.lua +++ /dev/null @@ -1,10 +0,0 @@ --- lua/plugins/nvimtree.lua --- print('nvimtree.lua loaded') - -return { - "nvim-tree/nvim-tree.lua", - - dependencies = { - "nvim-tree/nvim-web-devicons", - }, -} diff --git a/lua/plugins/oxocarbon.lua b/lua/plugins/oxocarbon.lua deleted file mode 100644 index d428c1b..0000000 --- a/lua/plugins/oxocarbon.lua +++ /dev/null @@ -1,12 +0,0 @@ --- lua/plugin/oxocarbon.lua --- print('oxocarbon.lua loaded') - -return { - "nyoom-engineering/oxocarbon.nvim", - "", - lazy = false, - priority = 1000, - config = function() - vim.cmd.colorscheme('oxocarbon') - end, -} diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua deleted file mode 100644 index b238db2..0000000 --- a/lua/plugins/telescope.lua +++ /dev/null @@ -1,11 +0,0 @@ --- lua/plugins/telescope.lua --- print('telescope.lua loaded') - -return { - "nvim-telescope/telescope-file-browser.nvim", - - dependencies = { - "nvim-telescope/telescope.nvim", - "nvim-lua/plenary.nvim" - }, -} diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua deleted file mode 100644 index 7b2bab3..0000000 --- a/lua/plugins/treesitter.lua +++ /dev/null @@ -1,12 +0,0 @@ --- lua/plugins/treesitter.lua --- print('treesitter.lua loaded') - -return { - "nvim-treesitter/nvim-treesitter", - - dependencies = { - "nvim-treesitter/nvim-treesitter-textobjects", - }, - - build = ":TSUpdate", -} diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua deleted file mode 100644 index 63781f0..0000000 --- a/lua/plugins/ui.lua +++ /dev/null @@ -1,20 +0,0 @@ --- lua/plugin/oxocarbon.lua --- print('oxocarbon.lua loaded') - -return { - { - "nyoom-engineering/oxocarbon.nvim", - lazy = false, - priority = 1000, - }, - { - 'kepano/flexoki-neovim', - name = 'flexoki', - lazy = false, - priority = 1000, - }, - --- config = function() --- vim.cmd.colorscheme('oxocarbon') --- end, -} diff --git a/lua/plugins/wichkey.lua b/lua/plugins/wichkey.lua deleted file mode 100644 index fe56b55..0000000 --- a/lua/plugins/wichkey.lua +++ /dev/null @@ -1,17 +0,0 @@ -return { - "folke/which-key.nvim", - event = "VeryLazy", - init = function() - vim.o.timeout = true - vim.o.timeoutlen = 300 - local wk = require("which-key") - wk.add({ - { "sa", name "[S]urround [A]dd" }, - }) - end, - opts = { - -- your configuration comes here - -- or leave it empty to use the default settings - -- refer to the configuration section below - }, -} diff --git a/lua/stevenmm/init.lua b/lua/stevenmm/init.lua index da90270..23bb507 100644 --- a/lua/stevenmm/init.lua +++ b/lua/stevenmm/init.lua @@ -23,7 +23,7 @@ autocmd("TextYankPost", { group = yank_group, pattern = "*", callback = function() - vim.highlight.on_yank({ + vim.hl.on_yank({ higroup = "IncSearch", timeout = 40, }) diff --git a/lua/stevenmm/lazy/formatting.lua b/lua/stevenmm/lazy/formatting.lua index 567e2e5..c820106 100644 --- a/lua/stevenmm/lazy/formatting.lua +++ b/lua/stevenmm/lazy/formatting.lua @@ -33,7 +33,7 @@ return { -- require("none-ls.diagnostics.eslint"), }, on_attach = function(client, bufnr) - if client.supports_method("textDocument/formatting") then + if client:supports_method("textDocument/formatting") then -- vim.api.nvim_buf_set_option(bufnr, "formatexpr", "v:lua.vim.lsp.formatexpr()") vim.api.nvim_set_option_value("formatexpr", "v:lua.vim.lsp.formatexpr()", { buf = bufnr }) end diff --git a/lua/stevenmm/lazy/lsp.lua b/lua/stevenmm/lazy/lsp.lua index e0932c5..44aa937 100644 --- a/lua/stevenmm/lazy/lsp.lua +++ b/lua/stevenmm/lazy/lsp.lua @@ -33,11 +33,21 @@ return { config = function() -- print("lsp.lua") - local lspconfig = require("lspconfig") - require("fidget").setup({}) + -- local lspconfig = require("lspconfig") + -- local lspconfig = vim.lsp.config + local lspconfig = vim.lsp.config + require("fidget").setup({ + notification = { + window = { + avoid = { + "NvimTree" + } + }, + }, + }) - lspconfig.gopls.setup({}) - lspconfig.lua_ls.setup({ + lspconfig.gopls = {} + lspconfig.lua_ls = { settings = { Lua = { runtime = { @@ -59,7 +69,7 @@ return { }, }, }, - }) + } vim.diagnostic.config({ -- virtual_text = false, @@ -76,7 +86,7 @@ return { focusable = true, style = "minimal", border = "rounded", - source = "always", + source = true, header = "", prefix = "", }, diff --git a/lua/stevenmm/lazy/mason.lua b/lua/stevenmm/lazy/mason.lua index 774e1e7..5683378 100644 --- a/lua/stevenmm/lazy/mason.lua +++ b/lua/stevenmm/lazy/mason.lua @@ -7,7 +7,8 @@ return { }, config = function() -- print('mason.lua') - local lspconfig = require("lspconfig") + -- local lspconfig = require("lspconfig") + local lspconfig = vim.lsp.config local capabilities = vim.tbl_deep_extend( "force", @@ -19,18 +20,21 @@ return { require("mason").setup({}) require("mason-lspconfig").setup({ ensure_installed = { - -- "ts_ls", - -- "gopls", - "clangd", - "rust_analyzer", - -- "lua_ls", + "lua_ls", + "gopls", + "ts_ls", + -- "clangd", + -- "rust_analyzer", -- "php" }, handlers = { function(server_name) -- default handler (optional) - require("lspconfig")[server_name].setup({ + vim.lsp.config(server_name, { capabilities = capabilities, }) + -- require("lspconfig")[server_name].setup({ + -- capabilities = capabilities, + -- }) end, ["ts_ls"] = function() -- local function organize_imports() @@ -41,7 +45,7 @@ return { -- } -- vim.lsp.buf.execute_command(params) -- end - lspconfig.ts_ls.setup({ + lspconfig.ts_ls = { capabilities = capabilities, -- commands = { -- OrganizeImports = { @@ -49,37 +53,28 @@ return { -- description = "Organize Imports", -- }, -- }, - }) + } end, - -- ["lua_ls"] = function() - -- local lspconfig = require("lspconfig") - -- lspconfig.lua_ls.setup({ - -- capabilities = capabilities, - -- settings = { - -- Lua = { - -- -- workspace = { - -- -- checkThirdParty = false, - -- -- library = vim.api.nvim_get_runtime_file("", true), - -- -- }, - -- diagnostics = { - -- globals = { "vim", "it", "describe", "before_each", "after_each" }, - -- }, - -- }, - -- }, - -- }) - -- end, - - ["clangd"] = function() - -- local lspconfig = require("lspconfig") - lspconfig.clangd.setup({ + ["lua_ls"] = function() + lspconfig.lua_ls = { capabilities = capabilities, - }) + settings = { + Lua = { + -- workspace = { + -- checkThirdParty = false, + -- library = vim.api.nvim_get_runtime_file("", true), + -- }, + diagnostics = { + globals = { "vim", "it", "describe", "before_each", "after_each" }, + }, + }, + }, + } end, ["gopls"] = function() - -- local lspconfig = require("lspconfig") - lspconfig.gopls.setup({ + lspconfig.gopls = { capabilities = capabilities, - }) + } end, }, }) diff --git a/lua/stevenmm/lazy/minisurround.lua b/lua/stevenmm/lazy/minisurround.lua index b64f35c..029949b 100644 --- a/lua/stevenmm/lazy/minisurround.lua +++ b/lua/stevenmm/lazy/minisurround.lua @@ -3,7 +3,7 @@ return { version = false, config = function() local minis = require("mini.surround").setup() - local wk = require('which-key') + local wk = require("which-key") wk.add({ { "s", group = "Search/Mini Surround" }, { "sa", desc = "[S]urround [A]dd", mode = "n", group = "Mini Surround" }, diff --git a/lua/stevenmm/lazy/treesitter.lua b/lua/stevenmm/lazy/treesitter.lua index 8b43a9e..a49d2f2 100644 --- a/lua/stevenmm/lazy/treesitter.lua +++ b/lua/stevenmm/lazy/treesitter.lua @@ -54,8 +54,8 @@ return { ensure_installed = { "bash", "c", - "c_sharp", "cpp", + "go", "diff", "html", "javascript", @@ -67,17 +67,14 @@ return { "luap", "markdown", "markdown_inline", - "php", "python", "query", "regex", - "rust", "toml", "tsx", "typescript", "vim", "vimdoc", - "vue", "xml", "yaml", }, diff --git a/lua/stevenmm/lazy/wichkey.lua b/lua/stevenmm/lazy/wichkey.lua index 6bde25a..b92e535 100644 --- a/lua/stevenmm/lazy/wichkey.lua +++ b/lua/stevenmm/lazy/wichkey.lua @@ -9,9 +9,9 @@ return { -- your configuration comes here -- or leave it empty to use the default settings -- refer to the configuration section below - spec = { - { "sa", name = "[S]urround [A]dd" }, - } + -- spec = { + -- { "sa", name = "[S]urround [A]dd" }, + -- } }, config = function(_, opts) local wk = require('which-key')