Compare commits

..

No commits in common. "6d97149d0f5a8076b7696445a07784a7363d5c7d" and "56276cca629915e5133546a7d73161aa68e93946" have entirely different histories.

6 changed files with 7 additions and 56 deletions

View File

@ -1,3 +0,0 @@
-- vim.diagnostic.config({
-- underline = false,
-- })

View File

@ -1,29 +1,24 @@
{ {
"extras": [ "extras": [
"lazyvim.plugins.extras.coding.mini-surround", "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.aerial", "lazyvim.plugins.extras.editor.aerial",
"lazyvim.plugins.extras.editor.fzf",
"lazyvim.plugins.extras.editor.harpoon2", "lazyvim.plugins.extras.editor.harpoon2",
"lazyvim.plugins.extras.editor.navic", "lazyvim.plugins.extras.editor.navic",
"lazyvim.plugins.extras.formatting.prettier", "lazyvim.plugins.extras.formatting.prettier",
"lazyvim.plugins.extras.lang.clangd", "lazyvim.plugins.extras.lang.clangd",
"lazyvim.plugins.extras.lang.elixir", "lazyvim.plugins.extras.lang.elixir",
"lazyvim.plugins.extras.lang.git",
"lazyvim.plugins.extras.lang.go", "lazyvim.plugins.extras.lang.go",
"lazyvim.plugins.extras.lang.java", "lazyvim.plugins.extras.lang.java",
"lazyvim.plugins.extras.lang.json",
"lazyvim.plugins.extras.lang.markdown",
"lazyvim.plugins.extras.lang.nix", "lazyvim.plugins.extras.lang.nix",
"lazyvim.plugins.extras.lang.omnisharp", "lazyvim.plugins.extras.lang.omnisharp",
"lazyvim.plugins.extras.lang.python",
"lazyvim.plugins.extras.lang.rust", "lazyvim.plugins.extras.lang.rust",
"lazyvim.plugins.extras.lang.tailwind", "lazyvim.plugins.extras.lang.tailwind",
"lazyvim.plugins.extras.lang.toml", "lazyvim.plugins.extras.lang.typescript"
"lazyvim.plugins.extras.util.mini-hipatterns"
], ],
"news": { "news": {
"NEWS.md": "6520" "NEWS.md": "6077"
}, },
"version": 6 "version": 6
} }

View File

@ -1,7 +0,0 @@
return {
-- {
-- "vhyrro/luarocks.nvim",
-- priority = 1000, -- Very high priority is required, luarocks.nvim should run as the first plugin in your config.
-- config = true,
-- },
}

View File

@ -1,14 +0,0 @@
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,
-- },
}

View File

@ -6,29 +6,16 @@ return {
default_settings = { default_settings = {
-- rust-analyzer language server configuration -- rust-analyzer language server configuration
["rust-analyzer"] = { ["rust-analyzer"] = {
-- rustfmt = {
-- overrideCommand = {
-- "leptosfmt",
-- "--stdin",
-- "--rustfmt",
-- },
-- },
cargo = { cargo = {
targetDir = true, targetDir = true,
buildScripts = { buildScripts = {
enable = false, enable = false,
}, },
}, },
procMacro = {
enable = true,
-- ignored = {
-- ["leptos_macro"] = { "component" },
-- },
},
checkOnSave = true, checkOnSave = true,
check = { -- check = {
command = "clippy", -- command = "clippy",
}, -- },
}, },
}, },
}, },

View File

@ -8,13 +8,6 @@ return {
{ "<space>ts", "<cmd>TSJSplit<cr>", desc = "Treesitter Split" }, { "<space>ts", "<cmd>TSJSplit<cr>", desc = "Treesitter Split" },
}, },
config = function() config = function()
require("treesj").setup({ require("treesj").setup({ use_default_keymaps = false })
use_default_keymaps = false,
on_error = function(err_text, level)
if not err_text:find("splitted") then
vim.cmd.join()
end
end,
})
end, end,
} }