diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index 5321a41b..9f2bcb45 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -1,14 +1,14 @@ { - "SchemaStore.nvim": { "branch": "main", "commit": "b37874a63ceac681a15b83d5c8e67f58fe571341" }, + "SchemaStore.nvim": { "branch": "main", "commit": "e98c273cb5c65e798176ed1283b80968c1e554eb" }, "barbecue.nvim": { "branch": "main", "commit": "da49e99f16da4a5d9653f61cbd26301ae7f26258" }, - "chadtree": { "branch": "chad", "commit": "e8013ad49e3fcedf766b7bccd46eed9e9298e447" }, + "chadtree": { "branch": "chad", "commit": "c37df0dcd9a379fc6e17dfaac42ecf9ce5b25977" }, "comfortable-motion.vim": { "branch": "master", "commit": "e20aeafb07c6184727b29f7674530150f7ab2036" }, "copilot.vim": { "branch": "release", "commit": "c7d166ebda265370f38cec374e33f02eeec2f857" }, - "coq.artifacts": { "branch": "artifacts", "commit": "e100e8e640bc14296199f94da965c575b41d5e24" }, - "coq.thirdparty": { "branch": "3p", "commit": "301810cb7b0d16c5a114c000979ef80d51003756" }, - "coq_nvim": { "branch": "coq", "commit": "1efb66d5e73cf984aeacc6792143712452a7925f" }, + "coq.artifacts": { "branch": "artifacts", "commit": "6acfe02d3b8057ed9ed5bbd02b1ecc426eb9d97d" }, + "coq.thirdparty": { "branch": "3p", "commit": "0b93c482acfc0bcdd760ff431b4d338e19395776" }, + "coq_nvim": { "branch": "coq", "commit": "49189b020236002bae41f823da9ac0f73dca873f" }, "crates.nvim": { "branch": "main", "commit": "e02eadc598b03d618c22200b0e7979048f6f96b1" }, - "dashboard-nvim": { "branch": "master", "commit": "28d5c20f0990ae1a71401ee8385954629d125986" }, + "dashboard-nvim": { "branch": "master", "commit": "94d830032abe1e464f6e76b7631dd23deb2f82cb" }, "diffview.nvim": { "branch": "main", "commit": "11827d46e939b4748dbdb7e0df4982a63bd59d26" }, "formatter.nvim": { "branch": "master", "commit": "8a4c961330cc4688087f23d18fa7d2f1af9a4902" }, "galaxyline.nvim": { "branch": "main", "commit": "4d4f5fc8e20a10824117e5beea7ec6e445466a8f" }, @@ -16,22 +16,22 @@ "glow.nvim": { "branch": "main", "commit": "2bb4afb6e9dbc93993a1d7d4168dac08c74590ac" }, "hop.nvim": { "branch": "v2", "commit": "90db1b2c61b820e230599a04fedcd2679e64bd07" }, "indent-blankline.nvim": { "branch": "master", "commit": "8299fe7703dfff4b1752aeed271c3b95281a952d" }, - "lazy.nvim": { "branch": "main", "commit": "4917222c7e5c924bf7471b72a5e2d3e661530b40" }, - "leap.nvim": { "branch": "main", "commit": "7140feed70a5911b8c8a7eb9c218d198772f69cf" }, + "lazy.nvim": { "branch": "main", "commit": "8aa90c34233f7de420b326de361137a571827d8c" }, + "leap.nvim": { "branch": "main", "commit": "1367a095f336c6c7ccda8c6747b57048fc5e008d" }, "lsp-status.nvim": { "branch": "master", "commit": "54f48eb5017632d81d0fd40112065f1d062d0629" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "7a97a77eee486ae152d2c559a459eda7c8aa12aa" }, - "mason.nvim": { "branch": "main", "commit": "47e9f6bc4c5bb3d6453949f07b8280c725ef7490" }, - "no-neck-pain.nvim": { "branch": "main", "commit": "26085b03b99bbd298fefe51ad65f1dd6debafb5e" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "e2b82cf4c68b453eeab5833d90c042ed4b49d0e1" }, + "mason.nvim": { "branch": "main", "commit": "672c4af8f4d23378f1fd1b6cb8dd460079963611" }, + "no-neck-pain.nvim": { "branch": "main", "commit": "7a84c5415cb1830c4b2fecdac14a0f50423209c7" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, "nvim-dap": { "branch": "master", "commit": "401f5f22b2d7f9bdbb9294d0235136091458816a" }, - "nvim-dap-ui": { "branch": "master", "commit": "100c67dd63c870819fb998fec4867b17d02db4b7" }, - "nvim-lspconfig": { "branch": "master", "commit": "27e6eb27f31d1ef41427e1008029284c02dc856f" }, + "nvim-dap-ui": { "branch": "master", "commit": "110193102b4840be8bda6eb2358367026145ae3a" }, + "nvim-lspconfig": { "branch": "master", "commit": "9b8f5260f3e793e2dcb2899e0a5b944667a95cb2" }, "nvim-navic": { "branch": "master", "commit": "7e9d2b2b601149fecdccd11b516acb721e571fe6" }, "nvim-notify": { "branch": "master", "commit": "bdd647f61a05c9b8a57c83b78341a0690e9c29d7" }, - "nvim-treesitter": { "branch": "master", "commit": "f6df07be122de665fb363476cc3680c90f5bdf05" }, - "nvim-treesitter-context": { "branch": "master", "commit": "cacee4828152dd3a83736169ae61bbcd29a3d213" }, - "nvim-web-devicons": { "branch": "master", "commit": "4475fe5ffd32360fb6c351abbfee8d7529a511e6" }, - "octo.nvim": { "branch": "master", "commit": "7900dc0cd37e7bb5d4175a37c9c4c3dfb94a1f7b" }, + "nvim-treesitter": { "branch": "master", "commit": "24f6653ffe0fed47b9b270a89ac5720f9ff6b16b" }, + "nvim-treesitter-context": { "branch": "master", "commit": "895ec44f5c89bc67ba5440aef3d1f2efa3d59a41" }, + "nvim-web-devicons": { "branch": "master", "commit": "bb6d4fd1e010300510172b173ab5205d37af084f" }, + "octo.nvim": { "branch": "master", "commit": "f336322f865cfa310ae15435c6bec337687b6b20" }, "plenary.nvim": { "branch": "master", "commit": "9a0d3bf7b832818c042aaf30f692b081ddd58bd9" }, "rest.nvim": { "branch": "main", "commit": "0fdb69f328529b34a2279c14be63b3325dc52740" }, "rust-tools.nvim": { "branch": "master", "commit": "bd1aa99ffb911a1cf99b3fcf3b44c0391c57e3ef" }, diff --git a/config/nvim/lua/lsp/lua-language-server.lua b/config/nvim/lua/lsp/lua-language-server.lua index 5b8ca72e..78999b17 100644 --- a/config/nvim/lua/lsp/lua-language-server.lua +++ b/config/nvim/lua/lsp/lua-language-server.lua @@ -2,7 +2,7 @@ local lspconfig = require 'lspconfig' local lspstatus = require('lsp-status') local coq = require 'coq' -lspconfig.sumneko_lua.setup { +lspconfig.lua_ls.setup { cmd = { "lua-language-server" }, on_attach = function(client) lspstatus.on_attach(client) end, capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities), @@ -22,5 +22,3 @@ lspconfig.sumneko_lua.setup { } } } --- lspconfig.sumenko_lua.setup(coq.lsp_ensure_capabilities()) --- require'lspconfig'.sumneko_lua.setup{coq.lsp_ensure_capabilities()} diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua index d5b4a83f..7236f9aa 100644 --- a/config/nvim/lua/plugins.lua +++ b/config/nvim/lua/plugins.lua @@ -42,11 +42,9 @@ return require('lazy').setup({ 'github/copilot.vim', 'ggandor/leap.nvim', { 'shortcuts/no-neck-pain.nvim', version = "*" }, - - { 'folke/zen-mode.nvim', config = function() require('zen-mode').setup() end }, - { 'folke/twilight.nvim', config = function() require('twilight').setup() end }, - - { 'pwntester/octo.nvim', config = function() require('octo').setup() end }, + { 'folke/zen-mode.nvim', config = function() require('zen-mode').setup() end }, + { 'folke/twilight.nvim', config = function() require('twilight').setup() end }, + { 'pwntester/octo.nvim', config = function() require('octo').setup() end }, { 'utilyre/barbecue.nvim', @@ -83,7 +81,7 @@ return require('lazy').setup({ "williamboman/mason-lspconfig.nvim", config = function() require("mason-lspconfig").setup({ - ensure_installed = { "sumneko_lua", "rust_analyzer" }, + ensure_installed = { "lua_ls", "rust_analyzer" }, automatic_installation = true, }) end @@ -94,8 +92,8 @@ return require('lazy').setup({ config = function() require('statusline') end, dependencies = { 'nvim-tree/nvim-web-devicons' } }, - { 'sainnhe/sonokai', config = function() require('colorscheme') end }, - { 'folke/which-key.nvim', config = function() require("which-key").setup() end }, + { 'sainnhe/sonokai', config = function() require('colorscheme') end }, + { 'folke/which-key.nvim', config = function() require("which-key").setup() end }, { 'nvim-telescope/telescope.nvim', dependencies = { 'nvim-lua/plenary.nvim' } }, { 'nvim-telescope/telescope-fzf-native.nvim', @@ -145,11 +143,10 @@ return require('lazy').setup({ }, }, } - end, }, - { 'neovim/nvim-lspconfig', config = function() require("lsp") end, }, + { 'neovim/nvim-lspconfig', config = function() require("lsp") end, }, { 'nvim-lua/lsp-status.nvim' }, { 'ms-jpq/coq_nvim', dependencies = { 'ms-jpq/coq.artifacts' }, build = ':COQdeps', @@ -158,7 +155,7 @@ return require('lazy').setup({ vim.g.coq_settings.keymap = { jump_to_mark = "" } end }, - { 'ms-jpq/chadtree', build = ':CHADdeps' }, + { 'ms-jpq/chadtree', build = ':CHADdeps' }, { 'ms-jpq/coq.thirdparty', config = function() require("coq_3p")({ { @@ -169,8 +166,8 @@ return require('lazy').setup({ deadline = 500, unsafe = { "rm", "poweroff", "mv" } }, - { src = "bc", short_name = "MATH", precision = 6 }, - { src = "copilot", short_name = "COP", accept_key = "" }, + { src = "bc", short_name = "MATH", precision = 6 }, + { src = "copilot", short_name = "COP", accept_key = "" }, { src = "dap" } }) end @@ -199,10 +196,10 @@ return require('lazy').setup({ config = function() require 'setup.toggleterm' end, }, - { - 'glepnir/dashboard-nvim', - config = function() require 'setup.dashboard' end, - }, + -- { + -- 'glepnir/dashboard-nvim', + -- config = function() require 'setup.dashboard' end, + -- }, { 'nvim-treesitter/nvim-treesitter',