merge

lua/config/mappings.lua

@@ -86,7 +86,7 @@ lo.cmd("<C-,>", "res -1")
 lo.cmd("<C-.>", "res +1")
 
 -- ascension (paste without replacing clipboard)
-m.map("x", "<leader>p", "\"_dhp")
+m.map("x", "<leader>p", "\"_dP")
 
 -- keep centered while moving around
 m.nmap("<C-u>", "<C-u>zz")

lua/plugins/dev.lua

@@ -1,10 +1,10 @@
 return {
-    -- {
+    {
-    --     "mrcjkb/rustaceanvim",
+        "mrcjkb/rustaceanvim",
-    --     ft = { "rust" },
+        ft = { "rust" },
-    --     version = '^7',
+        version = '^7',
-    --     lazy = false,
+        lazy = false,
-    -- },
+    },
     {
         "windwp/nvim-autopairs",
         config = function() require "nvim-autopairs".setup {} end

lua/plugins/lspconfig.lua

@@ -1,9 +1,10 @@
 local config = function()
+    local lsp = vim.lsp
     vim.g.markdown_fenced_languages = {
         "ts=typescript"
     }
 
-    vim.lsp.config("lua_ls", {
+    lsp.config["lua_ls"] = {
         settings = {
             Lua = {
                 diagnostics = {
@@ -18,17 +19,16 @@ local config = function()
                 },
             },
         },
-    })
+    }
-    vim.lsp.enable("denols")
+    lsp.enable("denols")
-    vim.lsp.enable("csharp_ls")
+    lsp.enable("csharp_ls")
-    vim.lsp.enable("rust_analyzer")
 
-    vim.lsp.enable("angularls")
+    lsp.enable("angularls")
-    vim.lsp.enable("clangd")
+    lsp.enable("clangd")
-    vim.lsp.enable("asm_lsp")
+    lsp.enable("asm_lsp")
-    vim.lsp.enable("pylsp")
+    lsp.enable("pylsp")
-    vim.lsp.enable("kotlin_language_server")
+    lsp.enable("kotlin_language_server")
-    vim.lsp.config("texlab", {
+    lsp.config["texlab"] = {
         settings = {
             texlab = {
                 build = {
@@ -37,17 +37,21 @@ local config = function()
                 }
             }
         }
-    })
+    }
-    vim.lsp.enable("wgsl_analyzer")
+    lsp.enable("wgsl_analyzer")
-    vim.lsp.enable("hls")
+    lsp.enable("hls")
-    vim.lsp.enable("slint_lsp")
+    lsp.enable("slint_lsp")
-    vim.lsp.config("tinymist", {
+    lsp.config["tinymist"] = {}
+    lsp.config["wgsl_analyzer"] = {}
+    lsp.config["hls"] = {}
+    lsp.config["slint_lsp"] = {}
+    lsp.config["tinymist"] = {
         root_dir = "-",
         settings = {
             exportPdf = "onSave",
             formatterMode = "typstyle",
         }
-    })
+    }
 
     require('mason').setup()
     require('mason-lspconfig').setup()