From b0b9fdb6f1310bd26a97a267f23a13100fe6a5d5 Mon Sep 17 00:00:00 2001 From: vx-clutch Date: Sun, 1 Jun 2025 18:27:26 -0400 Subject: [PATCH] save --- nvim/.config/nvim/lua/vxclutch/lazy/lsp.lua | 34 +++++++------------ .../nvim/lua/vxclutch/lazy/luasnip.lua | 25 ++++++++++++++ .../nvim/lua/vxclutch/snippets/all.lua | 3 ++ .../nvim/lua/vxclutch/snippets/typst.lua | 26 ++++++++++++++ 4 files changed, 67 insertions(+), 21 deletions(-) create mode 100644 nvim/.config/nvim/lua/vxclutch/lazy/luasnip.lua create mode 100644 nvim/.config/nvim/lua/vxclutch/snippets/all.lua create mode 100644 nvim/.config/nvim/lua/vxclutch/snippets/typst.lua diff --git a/nvim/.config/nvim/lua/vxclutch/lazy/lsp.lua b/nvim/.config/nvim/lua/vxclutch/lazy/lsp.lua index 7a0a4ed..6ec8f41 100644 --- a/nvim/.config/nvim/lua/vxclutch/lazy/lsp.lua +++ b/nvim/.config/nvim/lua/vxclutch/lazy/lsp.lua @@ -2,7 +2,7 @@ return { { "neovim/nvim-lspconfig", dependencies = { - { "mason-org/mason.nvim", version = "^1.0.0" }, + { "mason-org/mason.nvim", version = "^1.0.0" }, { "mason-org/mason-lspconfig.nvim", version = "^1.0.0" }, "j-hui/fidget.nvim", "stevearc/conform.nvim", @@ -88,8 +88,6 @@ return { ensure_installed = { "lua_ls", "clangd", - "gopls", - "rust_analyzer", "tinymist", }, handlers = { @@ -120,20 +118,6 @@ return { }) end, - ["svelte"] = function() - require("lspconfig").svelte.setup({ - capabilities = capabilities, - on_attach = function(client, bufnr) - vim.api.nvim_create_autocmd("BufWritePost", { - pattern = { "*.js", "*.ts" }, - callback = function(ctx) - client.notify("$/onDidChangeTsOrJsFile", { uri = ctx.match }) - end, - }) - end, - }) - end, - ["tinymist"] = function() require("lspconfig").tinymist.setup({ capabilities = capabilities, @@ -150,17 +134,25 @@ return { l.handlers["textDocument/hover"] = function(_, result, ctx, config) config = config or { border = "rounded", focusable = true } config.focus_id = ctx.method - if not (result and result.contents) then return end + if not (result and result.contents) then + return + end local markdown_lines = l.util.convert_input_to_markdown_lines(result.contents) - markdown_lines = vim.tbl_filter(function(line) return line ~= "" end, markdown_lines) - if vim.tbl_isempty(markdown_lines) then return end + markdown_lines = vim.tbl_filter(function(line) + return line ~= "" + end, markdown_lines) + if vim.tbl_isempty(markdown_lines) then + return + end return l.util.open_floating_preview(markdown_lines, "markdown", config) end local autocmd = vim.api.nvim_create_autocmd autocmd({ "BufEnter", "BufWinEnter" }, { pattern = { "*.vert", "*.frag" }, - callback = function() vim.cmd("set filetype=glsl") end, + callback = function() + vim.cmd("set filetype=glsl") + end, }) autocmd("LspAttach", { diff --git a/nvim/.config/nvim/lua/vxclutch/lazy/luasnip.lua b/nvim/.config/nvim/lua/vxclutch/lazy/luasnip.lua new file mode 100644 index 0000000..2f5f85f --- /dev/null +++ b/nvim/.config/nvim/lua/vxclutch/lazy/luasnip.lua @@ -0,0 +1,25 @@ +return { + "L3MON4D3/LuaSnip", + version = "v2.*", + build = "make install_jsregexp", + config = function() + require("luasnip.loaders.from_lua").load({ paths = "~/.config/nvim/lua/vxclutch/snippets/" }) + + local ls = require("luasnip") + vim.keymap.set({ "i" }, "", function() + ls.expand() + end, { silent = true }) + vim.keymap.set({ "i", "s" }, "", function() + ls.jump(1) + end, { silent = true }) + vim.keymap.set({ "i", "s" }, "", function() + ls.jump(-1) + end, { silent = true }) + + ls.config.setup({ + enable_autosnippets = true, + region_check_events = "InsertEnter", + delete_check_events = "InsertLeave", + }) + end, +} diff --git a/nvim/.config/nvim/lua/vxclutch/snippets/all.lua b/nvim/.config/nvim/lua/vxclutch/snippets/all.lua new file mode 100644 index 0000000..e7c5e46 --- /dev/null +++ b/nvim/.config/nvim/lua/vxclutch/snippets/all.lua @@ -0,0 +1,3 @@ +return { + s("date", t(os.date("%Y/%m/%d"))) +} diff --git a/nvim/.config/nvim/lua/vxclutch/snippets/typst.lua b/nvim/.config/nvim/lua/vxclutch/snippets/typst.lua new file mode 100644 index 0000000..cac8154 --- /dev/null +++ b/nvim/.config/nvim/lua/vxclutch/snippets/typst.lua @@ -0,0 +1,26 @@ +local ls = require("luasnip") +local s = ls.snippet +local sn = ls.snippet_node +local t = ls.text_node +local i = ls.insert_node +local f = ls.function_node +local d = ls.dynamic_node +local fmt = require("luasnip.extras.fmt").fmt +local fmta = require("luasnip.extras.fmt").fmta +local rep = require("luasnip.extras").rep + +return { + s( + { trig = "mla" }, + fmta( + [[ + Owen Westness + + #datetime.today().display("d MMMM yyyy") + + <> + ]], + { i(1) } + ) + ), +}