diff --git a/after/ftplugin/rust.lua b/after/ftplugin/rust.lua index 1e4bddf..c342ed0 100644 --- a/after/ftplugin/rust.lua +++ b/after/ftplugin/rust.lua @@ -1,3 +1,3 @@ -vim.diagnostic.config({ - underline = false, -}) +-- vim.diagnostic.config({ +-- underline = false, +-- }) diff --git a/lazyvim.json b/lazyvim.json index b0a5daf..df8d8f1 100644 --- a/lazyvim.json +++ b/lazyvim.json @@ -1,24 +1,29 @@ { "extras": [ "lazyvim.plugins.extras.coding.mini-surround", - "lazyvim.plugins.extras.dap.core", "lazyvim.plugins.extras.editor.aerial", "lazyvim.plugins.extras.editor.aerial", + "lazyvim.plugins.extras.editor.fzf", "lazyvim.plugins.extras.editor.harpoon2", "lazyvim.plugins.extras.editor.navic", "lazyvim.plugins.extras.formatting.prettier", "lazyvim.plugins.extras.lang.clangd", "lazyvim.plugins.extras.lang.elixir", + "lazyvim.plugins.extras.lang.git", "lazyvim.plugins.extras.lang.go", "lazyvim.plugins.extras.lang.java", + "lazyvim.plugins.extras.lang.json", + "lazyvim.plugins.extras.lang.markdown", "lazyvim.plugins.extras.lang.nix", "lazyvim.plugins.extras.lang.omnisharp", + "lazyvim.plugins.extras.lang.python", "lazyvim.plugins.extras.lang.rust", "lazyvim.plugins.extras.lang.tailwind", - "lazyvim.plugins.extras.lang.typescript" + "lazyvim.plugins.extras.lang.toml", + "lazyvim.plugins.extras.util.mini-hipatterns" ], "news": { - "NEWS.md": "6077" + "NEWS.md": "6520" }, "version": 6 } \ No newline at end of file diff --git a/lua/plugins/luarocks.lua b/lua/plugins/luarocks.lua new file mode 100644 index 0000000..0c81586 --- /dev/null +++ b/lua/plugins/luarocks.lua @@ -0,0 +1,7 @@ +return { + -- { + -- "vhyrro/luarocks.nvim", + -- priority = 1000, -- Very high priority is required, luarocks.nvim should run as the first plugin in your config. + -- config = true, + -- }, +} diff --git a/lua/plugins/otter.lua b/lua/plugins/otter.lua new file mode 100644 index 0000000..95620c3 --- /dev/null +++ b/lua/plugins/otter.lua @@ -0,0 +1,14 @@ +return { + -- { + -- "jmbuhr/otter.nvim", + -- dependencies = { + -- "hrsh7th/nvim-cmp", + -- "neovim/nvim-lspconfig", + -- "nvim-treesitter/nvim-treesitter", + -- }, + -- lazy = false, + -- config = function() + -- require("otter").activate({ "javascript", "python", "rust" }, true, true, nil) + -- end, + -- }, +} diff --git a/lua/plugins/rustacean.lua b/lua/plugins/rustacean.lua index 807ba8f..bbc0f31 100644 --- a/lua/plugins/rustacean.lua +++ b/lua/plugins/rustacean.lua @@ -6,16 +6,29 @@ return { default_settings = { -- rust-analyzer language server configuration ["rust-analyzer"] = { + -- rustfmt = { + -- overrideCommand = { + -- "leptosfmt", + -- "--stdin", + -- "--rustfmt", + -- }, + -- }, cargo = { targetDir = true, buildScripts = { enable = false, }, }, + procMacro = { + enable = true, + -- ignored = { + -- ["leptos_macro"] = { "component" }, + -- }, + }, checkOnSave = true, - -- check = { - -- command = "clippy", - -- }, + check = { + command = "clippy", + }, }, }, },