init.lua

@@ -339,9 +339,14 @@ local servers = {
             }
         },
     },
+    marksman = {},
     html = { provideFormatter = false },
     cssls = {},
     pyright = {},
+    vtsls = {},
+
+
+    texlab = {},
 
     jdtls = {
         java = {
@@ -383,7 +388,6 @@ vim.list_extend(ensure_installed, {
 })
 require('mason-tool-installer').setup { ensure_installed = ensure_installed }
 
-
 require('mason-lspconfig').setup {
     handlers = {
         function(server_name)
@@ -394,50 +398,45 @@ require('mason-lspconfig').setup {
     },
 }
 
+
+
+local lspconfig = require("lspconfig")
+
 local mason_registry = require('mason-registry')
 local vue_language_server_path = mason_registry.get_package('vue-language-server'):get_install_path() ..
     '/node_modules/@vue/language-server'
 
-local manual_servers = {
-    texlab = {},
-
-    tsserver = {
-        init_options = {
-            plugins = {
-                {
-                    name = '@vue/typescript-plugin',
-                    location = vue_language_server_path,
-                    languages = { 'vue' },
-                },
+lspconfig.tsserver.setup {
+    init_options = {
+        plugins = {
+            {
+                name = '@vue/typescript-plugin',
+                location = vue_language_server_path,
+                languages = { 'vue' },
             },
         },
-        filetypes = { 'typescript', 'javascript', 'javascriptreact', 'typescriptreact', 'vue' },
     },
+    filetypes = { 'typescript', 'javascript', 'javascriptreact', 'typescriptreact', 'vue' },
+}
 
-    volar = {
-        init_options = {
-            vue = {
-                hybridMode = true,
-            },
+lspconfig.volar.setup {
+    init_options = {
+        vue = {
+            hybridMode = true,
         },
-
     },
+}
 
-    rust_analyzer = {
-        settings = {
-            ['rust_analyzer'] = {
-                cargo = {
-                    allFeatures = true,
-                }
+lspconfig.rust_analyzer.setup {
+    capabilities = capabilities,
+    on_attach = on_attach,
+    settings = {
+        ['rust_analyzer'] = {
+            cargo = {
+                allFeatures = true,
             }
         }
     }
 }
-
-for server_name, config in pairs(manual_servers) do
-    config.capabilities = vim.tbl_deep_extend('force', {}, capabilities, config.capabilities or {})
-    require('lspconfig')[server_name].setup(config)
-end
-
 -- this is for my personal config, i cant bother seeing every TJ's default and changing it to my own
 require("jabuxas")

lua/custom/plugins/md.lua

@@ -2,15 +2,5 @@ return {
   "iamcco/markdown-preview.nvim",
   cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" },
   ft = { "markdown" },
-  build = function(plugin)
-    if vim.fn.executable "npx" then
-      vim.cmd("!cd " .. plugin.dir .. " && cd app && npx --yes yarn install")
-    else
-      vim.cmd [[Lazy load markdown-preview.nvim]]
-      vim.fn["mkdp#util#install"]()
-    end
-  end,
-  init = function()
-    if vim.fn.executable "npx" then vim.g.mkdp_filetypes = { "markdown" } end
-  end,
+  build = function() vim.fn["mkdp#util#install"]() end,
 }

lua/jabuxas/remap.lua

@@ -91,7 +91,3 @@ nmap('<leader>wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Fo
 nmap('<leader>wl', function()
     print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
 end, '[W]orkspace [L]ist Folders')
-
-vim.keymap.set('c', ';;', function()
-    return vim.fn.getcmdtype() == ':' and vim.fn.expand('%:h') .. '/' or ';;'
-end, { expr = true })