From 8290a9cfe1fede1478b2bda3321e239c68020be0 Mon Sep 17 00:00:00 2001 From: zackartz Date: Wed, 20 Mar 2024 12:39:41 -0400 Subject: [PATCH] 247 current 2024-03-20 12:39:31 24.05.20240319.b06025f 6.8.0-zen1 * --- .../vim/config/lua/plugins/lsp/null-ls.lua | 2 ++ .../config/lua/plugins/lsp/server-plugins.lua | 36 +++---------------- .../vim/config/lua/plugins/ui/neo-tree.lua | 2 +- modules/home-manager/vim/lazy-lock.json | 2 +- 4 files changed, 9 insertions(+), 33 deletions(-) diff --git a/modules/home-manager/vim/config/lua/plugins/lsp/null-ls.lua b/modules/home-manager/vim/config/lua/plugins/lsp/null-ls.lua index 2229a96..9cd1002 100644 --- a/modules/home-manager/vim/config/lua/plugins/lsp/null-ls.lua +++ b/modules/home-manager/vim/config/lua/plugins/lsp/null-ls.lua @@ -7,6 +7,8 @@ return { null_ls.setup({ debug = false, sources = { + null_ls.builtins.formatting.prettier, + null_ls.builtins.formatting.stylua, null_ls.builtins.formatting.rustfmt.with({ extra_args = { "--edition=2021" }, }), diff --git a/modules/home-manager/vim/config/lua/plugins/lsp/server-plugins.lua b/modules/home-manager/vim/config/lua/plugins/lsp/server-plugins.lua index 2363856..c3983e1 100644 --- a/modules/home-manager/vim/config/lua/plugins/lsp/server-plugins.lua +++ b/modules/home-manager/vim/config/lua/plugins/lsp/server-plugins.lua @@ -15,35 +15,9 @@ return { }) end, }, - { - "simrat39/rust-tools.nvim", - ft = "rust", - config = function() - require("rust-tools").setup({ - tools = { - inlay_hints = { - auto = false, - }, - }, - server = { - settings = { - ["rust-analyzer"] = { - cargo = { - features = "all", - }, - checkOnSave = { - features = "all", - }, - }, - }, - }, - dap = { - adapter = require("rust-tools.dap").get_codelldb_adapter( - "/home/luckas/.local/share/nvim/mason/packages/codelldb/extension/adapter/codelldb", - "/home/luckas/.local/share/nvim/mason/packages/codelldb/extension/lldb/lib/liblldb.so" - ), - }, - }) - end, - }, +{ + 'mrcjkb/rustaceanvim', + version = '^4', -- Recommended + ft = { 'rust' }, +} } diff --git a/modules/home-manager/vim/config/lua/plugins/ui/neo-tree.lua b/modules/home-manager/vim/config/lua/plugins/ui/neo-tree.lua index 6885269..70440d3 100644 --- a/modules/home-manager/vim/config/lua/plugins/ui/neo-tree.lua +++ b/modules/home-manager/vim/config/lua/plugins/ui/neo-tree.lua @@ -28,7 +28,7 @@ return { }, }, filesystem = { - follow_current_file = true, + follow_current_file = { enabled = true }, hijack_netrw_behavior = "open_current", use_libuv_file_watcher = true, }, diff --git a/modules/home-manager/vim/lazy-lock.json b/modules/home-manager/vim/lazy-lock.json index f1d5337..839c59b 100644 --- a/modules/home-manager/vim/lazy-lock.json +++ b/modules/home-manager/vim/lazy-lock.json @@ -20,7 +20,6 @@ "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "lspkind-nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, "lualine.nvim": { "branch": "master", "commit": "af4c3cf17206810880d2a93562e0a4c0d901c684" }, - "mason-nvim-dap.nvim": { "branch": "main", "commit": "67210c0e775adec55de9826b038e8b62de554afc" }, "move.nvim": { "branch": "main", "commit": "cccbd4ea9049ca5f99f025ffaddb7392359c7d6a" }, "neo-rename.nvim": { "branch": "master", "commit": "d3f065ab1168fe95ea3ab939fbc659de47e130fc" }, "neo-tree.nvim": { "branch": "main", "commit": "6011391412b003ffbaf5615d6df8ade154726117" }, @@ -44,6 +43,7 @@ "nvim-ts-context-commentstring": { "branch": "main", "commit": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a" }, "nvim-ufo": { "branch": "main", "commit": "c1e8102e4e954e1c46f46cda2587769238e24f16" }, "nvim-web-devicons": { "branch": "master", "commit": "cb0c967c9723a76ccb1be0cc3a9a10e577d2f6ec" }, + "overseer.nvim": { "branch": "master", "commit": "b72f6d23ce47ccd427be2341f389c63448278f17" }, "plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" }, "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" }, "rust-tools.nvim": { "branch": "master", "commit": "676187908a1ce35ffcd727c654ed68d851299d3e" },