add swift lsp

change mason stuff
remove old keymaps
2025-09-23 13:49:20 +02:00 · 2025-09-23 13:49:09 +02:00 · 2025-09-23 13:48:58 +02:00 · 2025-08-08 15:52:29 +02:00 · 2025-07-29 00:36:03 +02:00 · 2025-07-29 00:35:40 +02:00
10 changed files with 101 additions and 61 deletions
--- a/.luarc.json
+++ b/.luarc.json
@@ -1,5 +1,6 @@
 {
    "diagnostics.disable": [
-        "unused-local"
+        "unused-local",
+        "redundant-return-value"
    ]
 }
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -3,46 +3,46 @@
  "alpha-nvim": { "branch": "main", "commit": "2b3cbcdd980cae1e022409289245053f62fb50f6" },
  "barbecue.nvim": { "branch": "main", "commit": "cd7e7da622d68136e13721865b4d919efd6325ed" },
  "blink.cmp": { "branch": "main", "commit": "485c03400608cb6534bbf84da8c1c471fc4808c0" },
-  "catppuccin": { "branch": "main", "commit": "fa42eb5e26819ef58884257d5ae95dd0552b9a66" },
-  "conform.nvim": { "branch": "master", "commit": "973f3cb73887d510321653044791d7937c7ec0fa" },
+  "catppuccin": { "branch": "main", "commit": "f19cab18ec4dc86d415512c7a572863b2adbcc18" },
+  "conform.nvim": { "branch": "master", "commit": "b4aab989db276993ea5dcb78872be494ce546521" },
  "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
  "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
  "flutter-tools.nvim": { "branch": "main", "commit": "65b7399804315a1160933b64292d3c5330aa4e9f" },
-  "fzf-lua": { "branch": "main", "commit": "f8805989fc8f164ea3fab37bdec963add9576964" },
-  "gitsigns.nvim": { "branch": "main", "commit": "7bbc674278f22376850576dfdddf43bbc17e62b5" },
+  "fzf-lua": { "branch": "main", "commit": "3776d03a4afa967bd6c4b7f78e9e90bc21425236" },
+  "gitsigns.nvim": { "branch": "main", "commit": "f780609807eca1f783a36a8a31c30a48fbe150c5" },
  "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" },
  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
-  "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
-  "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "7815740f4d0afb74ada00956c36e18ad695ed9e3" },
-  "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" },
+  "lazydev.nvim": { "branch": "main", "commit": "258d2a5ef4a3e3d6d9ba9da72c9725c53e9afcbd" },
+  "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "a1067cf84b4ff81b66d2bf4d01f4cbdb5de40bd0" },
+  "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" },
  "mini.indentscope": { "branch": "main", "commit": "8af2569a7d7fd37300dfa760e44e71efbbf322fd" },
  "mini.surround": { "branch": "main", "commit": "5aab42fcdcf31fa010f012771eda5631c077840a" },
  "neogen": { "branch": "main", "commit": "d7f9461727751fb07f82011051338a9aba07581d" },
  "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
-  "nvim-lspconfig": { "branch": "master", "commit": "592916db3f4ecdf062962b3aa83583aebe3c4a14" },
+  "nvim-lspconfig": { "branch": "master", "commit": "ef73a4f2a1ddf0439eb97b46de2aab265ddba1cd" },
  "nvim-navic": { "branch": "master", "commit": "f887d794a0f4594882814d7780980a949200a238" },
  "nvim-spectre": { "branch": "master", "commit": "72f56f7585903cd7bf92c665351aa585e150af0f" },
  "nvim-tree-docs": { "branch": "master", "commit": "5db023d783da1e55339e5e25caaf72a59597e626" },
  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
  "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" },
-  "nvim-web-devicons": { "branch": "master", "commit": "a1366758b3a232036dc97be8ca41184aa3f50506" },
+  "nvim-web-devicons": { "branch": "master", "commit": "6e51ca170563330e063720449c21f43e27ca0bc1" },
  "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" },
-  "oil.nvim": { "branch": "master", "commit": "bbad9a76b2617ce1221d49619e4e4b659b3c61fc" },
-  "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
-  "render-markdown.nvim": { "branch": "main", "commit": "c3012098bd44381e3b96bbbbbcc21a54d45a286c" },
+  "oil.nvim": { "branch": "master", "commit": "07f80ad645895af849a597d1cac897059d89b686" },
+  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
+  "render-markdown.nvim": { "branch": "main", "commit": "67f2c7c8850bb11eefa6b22054a6f4cef1146de2" },
  "tailwind-tools.nvim": { "branch": "master", "commit": "fbe982901d4508b0dcd80e07addf0fcb6dab6c49" },
  "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
  "tiny-devicons-auto-colors.nvim": { "branch": "main", "commit": "51f548421f8a74680eff27d283c9d5ea6e8d0074" },
  "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
-  "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
+  "trouble.nvim": { "branch": "main", "commit": "f176232e7759c4f8abd923c21e3e5a5c76cd6837" },
  "tsc.nvim": { "branch": "main", "commit": "8c1b4ec6a48d038a79ced8674cb15e7db6dd8ef0" },
-  "undotree": { "branch": "master", "commit": "15d91b0afe04ea9ba5cd53e30190d1602af9a925" },
+  "undotree": { "branch": "master", "commit": "fe9a9d0645f0f5532360b5e5f5c550d7bb4f1869" },
  "vim-dadbod": { "branch": "master", "commit": "e95afed23712f969f83b4857a24cf9d59114c2e6" },
  "vim-dadbod-completion": { "branch": "master", "commit": "a8dac0b3cf6132c80dc9b18bef36d4cf7a9e1fe6" },
-  "vim-dadbod-ui": { "branch": "master", "commit": "2900a1617b3df1a48683d872eadbe1101146a49a" },
-  "vim-fugitive": { "branch": "master", "commit": "593f831d6f6d779cbabb70a4d1e6b1b1936a88af" },
+  "vim-dadbod-ui": { "branch": "master", "commit": "e8b53c0f3aa6e6127ac2a2d2071d9aade6c6e373" },
+  "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" },
  "vim-pencil": { "branch": "master", "commit": "6d70438a8886eaf933c38a7a43a61adb0a7815ed" },
-  "vim-tmux-navigator": { "branch": "master", "commit": "412c474e97468e7934b9c217064025ea7a69e05e" }
+  "vim-tmux-navigator": { "branch": "master", "commit": "c45243dc1f32ac6bcf6068e5300f3b2b237e576a" }
 }
--- a/lua/409/autocmd.lua
+++ b/lua/409/autocmd.lua
@@ -14,5 +14,8 @@ vim.api.nvim_create_autocmd({ "TextChanged" }, {
 		-- This updates the LSP diagnostics
 		vim.cmd("startinsert")
 		vim.cmd("stopinsert")
+
+		local pos = vim.api.nvim_win_get_cursor(0)
+		vim.api.nvim_win_set_cursor(0, pos)
 	end,
 })
--- a/lua/409/lsp.lua
+++ b/lua/409/lsp.lua
@@ -61,7 +61,7 @@ vim.api.nvim_create_autocmd("LspAttach", {
 		vim.keymap.set("n", "]d", function()
 			vim.diagnostic.jump({ count = -1 })
 		end, lsp_opts)
-		vim.keymap.set("n", "<leader>vca", function()
+		vim.keymap.set("n", "<c-m>", function()
 			vim.lsp.buf.code_action()
 		end, lsp_opts)
 		vim.keymap.set("n", "<leader>vrr", function()
@@ -73,7 +73,7 @@ vim.api.nvim_create_autocmd("LspAttach", {
 		vim.keymap.set("i", "<C-h>", function()
 			vim.lsp.buf.signature_help()
 		end, lsp_opts)
-	end
+	end,
 })

 vim.lsp.config.tailwindcss = {
@@ -121,13 +121,15 @@ vim.lsp.config.vtsls = {
 						name = "typescript-svelte-plugin",
 						location = vim.fn.getcwd() .. "/node_modules/typescript-svelte-plugin",
 						enableForWorkspaceTypeScriptVersions = true,
-					}, {
-					name = "@vue/typescript-plugin",
-					location = vim.fn.expand "$MASON/packages" ..
-						"/vue-language-server" .. "/node_modules/@vue/language-server",
-					languages = { "vue" },
-					configNamespace = 'typescript',
-				},
+					},
+					{
+						name = "@vue/typescript-plugin",
+						location = vim.fn.expand("$MASON/packages")
+							.. "/vue-language-server"
+							.. "/node_modules/@vue/language-server",
+						languages = { "vue" },
+						configNamespace = "typescript",
+					},
 				},
 			},
 		},
@@ -152,11 +154,13 @@ vim.lsp.config.vtsls = {

 vim.lsp.config.vue_ls = {
 	on_init = function(client)
-		client.handlers['tsserver/request'] = function(_, result, context)
-			local clients = vim.lsp.get_clients({ bufnr = context.bufnr, name = 'vtsls' })
+		client.handlers["tsserver/request"] = function(_, result, context)
+			local clients = vim.lsp.get_clients({ bufnr = context.bufnr, name = "vtsls" })
 			if #clients == 0 then
-				vim.notify('Could not found `vtsls` lsp client, vue_lsp would not work without it.',
-					vim.log.levels.ERROR)
+				vim.notify(
+					"Could not found `vtsls` lsp client, vue_lsp would not work without it.",
+					vim.log.levels.ERROR
+				)
 				return
 			end
 			local ts_client = clients[1]
@@ -164,8 +168,8 @@ vim.lsp.config.vue_ls = {
 			local param = unpack(result)
 			local id, command, payload = unpack(param)
 			ts_client:exec_cmd({
-				title = 'vue_request_forward', -- You can give title anything as it's used to represent a command in the UI, `:h Client:exec_cmd`
-				command = 'typescript.tsserverRequest',
+				title = "vue_request_forward", -- You can give title anything as it's used to represent a command in the UI, `:h Client:exec_cmd`
+				command = "typescript.tsserverRequest",
 				arguments = {
 					command,
 					payload,
@@ -173,7 +177,7 @@ vim.lsp.config.vue_ls = {
 			}, { bufnr = context.bufnr }, function(_, r)
 				local response_data = { { id, r.body } }
 				---@diagnostic disable-next-line: param-type-mismatch
-				client:notify('tsserver/response', response_data)
+				client:notify("tsserver/response", response_data)
 			end)
 		end
 	end,
@@ -185,4 +189,35 @@ vim.lsp.config.svelte = {
 			didChangeWatchedFiles = { dynamicRegistration = true },
 		},
 	},
+	on_attach = function(client)
+		vim.api.nvim_create_autocmd("BufWritePost", {
+			pattern = { "*.svelte", "*.js", "*.ts" },
+			group = vim.api.nvim_create_augroup("svelte_ondidchangetsorjsfile", { clear = true }),
+			callback = function(ctx)
+				client.notify(client, "$/onDidChangeTsOrJsFile", { uri = ctx.match })
+			end,
+		})
+	end,
 }
+
+vim.lsp.config.cssls = {
+	settings = {
+		css = {
+			lint = {
+				unknownAtRules = "ignore",
+			},
+		},
+	},
+}
+
+vim.lsp.config.sourcekit = {
+	capabilities = {
+		workspace = {
+			didChangeWatchedFiles = {
+				dynamicRegistration = true,
+			},
+		},
+	},
+}
+
+vim.lsp.enable("sourcekit")
--- a/lua/409/plugins/formatting.lua
+++ b/lua/409/plugins/formatting.lua
@@ -13,6 +13,7 @@ return {
 					typescriptreact = { "prettierd" },
 					css = { "prettierd" },
 					svelte = { "prettier" },
+					vue = { "prettier" },
 					svelteress = { "prettier" },
 					json = { "prettierd" },
 					dart = { "dart_format" },
--- a/lua/409/plugins/git.lua
+++ b/lua/409/plugins/git.lua
@@ -52,6 +52,9 @@ return {
 			current_line_blame_opts = {
 				delay = 1000,
 			},
+			preview_config = {
+				border = "single",
+			},
 		},
 		config = true,
 	},
--- a/lua/409/plugins/mason.lua
+++ b/lua/409/plugins/mason.lua
@@ -8,30 +8,30 @@ return {
 				border = "single",
 			},
 		},
-		config = function(_, opts)
-			require("mason").setup(opts)
-		end,
+		config = true,
 	},
 	{
 		"mason-org/mason-lspconfig.nvim",
-		opts = {
-			"vtsls",
-			"eslint",
-			"lua_ls",
-			"jsonls",
-			"html",
-			"tailwindcss",
-			"pylsp",
-			"dockerls",
-			"bashls",
-			"marksman",
-			"rust_analyzer",
-		},
 		dependencies = {
-			{
-				"mason-org/mason.nvim", opts = {}
-			},
+			"mason-org/mason.nvim",
 			"neovim/nvim-lspconfig",
 		},
-	}
+		opts = {
+			ensure_installed = {
+				"vtsls",
+				"eslint",
+				"lua_ls",
+				"jsonls",
+				"html",
+				"tailwindcss",
+				"pylsp",
+				"dockerls",
+				"bashls",
+				"marksman",
+				"rust_analyzer",
+			},
+			automatic_enable = true,
+		},
+		config = true
+	},
 }
--- a/lua/409/plugins/theme.lua
+++ b/lua/409/plugins/theme.lua
@@ -31,6 +31,8 @@ return {

 			vim.api.nvim_set_hl(0, "LineNr", { fg = colors.surface2 })

+			vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
+
 			vim.api.nvim_set_hl(0, "QuickFixLine", { link = "Visual" })
 			vim.api.nvim_set_hl(0, "TelescopePromptBorder", { link = "FloatBorder" })
 			vim.api.nvim_set_hl(0, "TelescopePreviewBorder", { link = "FloatBorder" })
--- a/lua/409/plugins/treesitter.lua
+++ b/lua/409/plugins/treesitter.lua
@@ -6,6 +6,7 @@ return {
 			"nvim-treesitter/nvim-tree-docs",
 			"JoosepAlviste/nvim-ts-context-commentstring",
 		},
+		lazy = false,
 		config = function()
 			require("nvim-treesitter.configs").setup({
 				-- A list of parser names, or "all" (the five listed parsers should always be installed)
--- a/lua/409/remap.lua
+++ b/lua/409/remap.lua
@@ -9,23 +9,17 @@ vim.keymap.set("n", "<C-u>", "<C-u>zz")
 vim.keymap.set("n", "n", "nzzzv")
 vim.keymap.set("n", "N", "Nzzzv")

-- greatest remap ever
 vim.keymap.set("x", "<leader>p", [["_dP]])

-- next greatest remap ever : asbjornHaland
 vim.keymap.set({ "n", "v" }, "<leader>y", [["+y]])
 vim.keymap.set("n", "<leader>Y", [["+Y]])

 vim.keymap.set({ "n", "v" }, "<leader>d", [["_d]])

-- This is going to get me cancelled
 vim.keymap.set("i", "<C-c>", "<Esc>")

 vim.keymap.set("n", "Q", "<nop>")
-vim.keymap.set("n", "<C-f>", "<cmd>silent !tmux neww tmux-sessionizer<CR>")

-- vim.keymap.set("n", "<C-k>", "<cmd>cnext<CR>zz")
-- vim.keymap.set("n", "<C-j>", "<cmd>cprev<CR>zz")
 vim.keymap.set("n", "<leader>k", "<cmd>lnext<CR>zz")
 vim.keymap.set("n", "<leader>j", "<cmd>lprev<CR>zz")
Author	SHA1	Message	Date
409	6fdfbd74cf	add swift lsp	2025-09-23 13:49:20 +02:00
409	a31a975a98	change mason stuff	2025-09-23 13:49:09 +02:00
409	95e4b5750b	remove old keymaps	2025-09-23 13:48:58 +02:00
409	ee32923a3c	fix float background color	2025-08-08 15:52:29 +02:00
409	3b0e43f2f9	fix lsp stuff	2025-07-29 00:36:03 +02:00
409	0d2fe89b90	fix gitsigns hunk preview border	2025-07-29 00:35:40 +02:00
409	32d8426cb2	add svelte `BufWritePost` notify autocmd	2025-07-11 23:43:34 +02:00
409	78f42f8523	formatting stuff	2025-07-11 22:01:54 +02:00