just catching up commits

after/ftplugin/rust.lua

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

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
 }

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,
+  -- },
+}

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,
+  -- },
+}

lua/plugins/rustacean.lua

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

lua/plugins/treesj.lua

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