michael/dotfiles
1
0
Fork 0
mirror of https://github.com/m-housh/dotfiles.git synced 2026-02-14 06:12:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Adds typst preview and language server.

Browse Source
This commit is contained in:
Michael Housh
2025-04-23 11:08:11 -04:00
parent cbe4ebc538
commit ecf3e98e25
3 changed files with 110 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nvim/lazynvim/lua/plugins/lsp.lua
View File

@@ -9,6 +9,7 @@ return {
"clangd", "clangd",
"marksman", "marksman",
"shfmt", "shfmt",
"tinymist",
}, },
}, },
}, },

6
nvim/lazynvim/lua/plugins/typst-preview.lua Normal file
View File

@@ -0,0 +1,6 @@
return {
'chomosuke/typst-preview.nvim',
lazy = false, -- or ft = 'typst'
version = '1.*',
opts = {}, -- lazy.nvim will implicitly calls `setup {}`
}

204
nvim/m-housh/lua/plugins/lsp.lua
View File

@@ -1,118 +1,120 @@
return { return {
{ {
"neovim/nvim-lspconfig", "neovim/nvim-lspconfig",
event = { "BufReadPre", "BufNewFile" }, event = { "BufReadPre", "BufNewFile" },
dependencies = { dependencies = {
"hrsh7th/cmp-nvim-lsp", "hrsh7th/cmp-nvim-lsp",
-- "saghen/blink.cmp", -- "saghen/blink.cmp",
{ "antosha417/nvim-lsp-file-operations", config = true }, { "antosha417/nvim-lsp-file-operations", config = true },
"williamboman/mason.nvim", "williamboman/mason.nvim",
"williamboman/mason-lspconfig.nvim", "williamboman/mason-lspconfig.nvim",
{ {
"folke/lazydev.nvim", "folke/lazydev.nvim",
ft = "lua", ft = "lua",
opts = { opts = {
library = { library = {
{ path = "${3rd}/luv/library", words = { "vim%.uv" } }, { path = "${3rd}/luv/library", words = { "vim%.uv" } },
}, },
}, },
}, },
}, },
config = function() config = function()
require("mason").setup() require("mason").setup()
require("mason-lspconfig").setup({ require("mason-lspconfig").setup({
ensure_installed = { ensure_installed = {
"bashls", "bashls",
"clangd", "clangd",
"dockerls", "dockerls",
"gopls", "gopls",
"jinja_lsp", "jinja_lsp",
"jqls", "jqls",
"jsonls", "jsonls",
"ltex", "ltex",
"lua_ls", "lua_ls",
"marksman", "marksman",
"yamlls", "tinymist",
}, "yamlls",
automatic_installation = true, },
}) automatic_installation = true,
local lspconfig = require("lspconfig") })
local cmp_nvim_lsp = require("cmp_nvim_lsp") local lspconfig = require("lspconfig")
local capabilities = cmp_nvim_lsp.default_capabilities() local cmp_nvim_lsp = require("cmp_nvim_lsp")
-- local capabilities = require("blink.cmp").get_lsp_capabilities() local capabilities = cmp_nvim_lsp.default_capabilities()
local opts = { noremap = true, silent = true } -- local capabilities = require("blink.cmp").get_lsp_capabilities()
local on_attach = function(_, bufnr) local opts = { noremap = true, silent = true }
opts.buffer = bufnr local on_attach = function(_, bufnr)
opts.buffer = bufnr
opts.desc = "Show line diagnostics" opts.desc = "Show line diagnostics"
vim.keymap.set("n", "<leader>d", vim.diagnostic.open_float, opts) vim.keymap.set("n", "<leader>d", vim.diagnostic.open_float, opts)
opts.desc = "Show diagnostics in Telescope" opts.desc = "Show diagnostics in Telescope"
vim.keymap.set("n", "<leader><leader>d", "<CMD>Telescope diagnostics bufnr=0<CR>", opts) vim.keymap.set("n", "<leader><leader>d", "<CMD>Telescope diagnostics bufnr=0<CR>", opts)
opts.desc = "Show documentation for what is under cursor" opts.desc = "Show documentation for what is under cursor"
vim.keymap.set("n", "<C-k>", vim.lsp.buf.hover, opts) vim.keymap.set("n", "<C-k>", vim.lsp.buf.hover, opts)
opts.desc = "[G]oto [D]efinition" opts.desc = "[G]oto [D]efinition"
vim.keymap.set("n", "gd", "<cmd>Telescope lsp_definitions trim_text=true<cr>", opts) vim.keymap.set("n", "gd", "<cmd>Telescope lsp_definitions trim_text=true<cr>", opts)
opts.desc = "[G]oto [D]eclaration" opts.desc = "[G]oto [D]eclaration"
vim.keymap.set("n", "gD", vim.lsp.buf.declaration, opts) vim.keymap.set("n", "gD", vim.lsp.buf.declaration, opts)
opts.desc = "[G]oto [R]eferences" opts.desc = "[G]oto [R]eferences"
vim.keymap.set("n", "gr", "<CMD>Telescope lsp_references<CR>", opts) vim.keymap.set("n", "gr", "<CMD>Telescope lsp_references<CR>", opts)
opts.desc = "LSP [C]ode [A]ction" opts.desc = "LSP [C]ode [A]ction"
vim.keymap.set("n", "<leader>ca", vim.lsp.buf.code_action, opts) vim.keymap.set("n", "<leader>ca", vim.lsp.buf.code_action, opts)
--opts.desc = "[R]e-[N]ame" --opts.desc = "[R]e-[N]ame"
--vim.keymap.set("n", "<leader>rn", vim.lsp.buf.rename, opts) --vim.keymap.set("n", "<leader>rn", vim.lsp.buf.rename, opts)
opts.desc = "[R]eload or start LSP" opts.desc = "[R]eload or start LSP"
vim.keymap.set({ "n", "x" }, "<leader>rl", ":LspRestart | :LspStart<CR>", opts) vim.keymap.set({ "n", "x" }, "<leader>rl", ":LspRestart | :LspStart<CR>", opts)
opts.desc = "Goto previous diagnostic" opts.desc = "Goto previous diagnostic"
vim.keymap.set("n", "[d", vim.diagnostic.goto_prev, opts) vim.keymap.set("n", "[d", vim.diagnostic.goto_prev, opts)
opts.desc = "Goto next diagnostic" opts.desc = "Goto next diagnostic"
vim.keymap.set("n", "]d", vim.diagnostic.goto_next, opts) vim.keymap.set("n", "]d", vim.diagnostic.goto_next, opts)
end end
-- The language servers to setup. -- The language servers to setup.
local lsp_servers = { local lsp_servers = {
"bashls", "bashls",
"clangd", "clangd",
"dockerls", "dockerls",
"gopls", "gopls",
"jsonls", "jsonls",
"lua_ls", "lua_ls",
"marksman", "marksman",
"sourcekit", "sourcekit",
"yamlls", "tinymist",
} "yamlls",
}
for _, lsp in ipairs(lsp_servers) do for _, lsp in ipairs(lsp_servers) do
lspconfig[lsp].setup({ lspconfig[lsp].setup({
capabilities = capabilities, capabilities = capabilities,
on_attach = on_attach, on_attach = on_attach,
on_init = function(client) on_init = function(client)
-- HACK: to fix some issues with LSP -- HACK: to fix some issues with LSP
-- more details: https://github.com/neovim/neovim/issues/19237#issuecomment-2237037154 -- more details: https://github.com/neovim/neovim/issues/19237#issuecomment-2237037154
client.offset_encoding = "utf-8" client.offset_encoding = "utf-8"
end, end,
cmd = lsp == "sourcekit" and { vim.trim(vim.fn.system("xcrun -f sourcekit-lsp")) } or nil, cmd = lsp == "sourcekit" and { vim.trim(vim.fn.system("xcrun -f sourcekit-lsp")) } or nil,
}) })
end end
-- nice icons -- nice icons
local signs = { Error = "", Warn = "", Hint = "󰠠 ", Info = "" } local signs = { Error = "", Warn = "", Hint = "󰠠 ", Info = "" }
for type, icon in pairs(signs) do for type, icon in pairs(signs) do
local hl = "DiagnosticSign" .. type local hl = "DiagnosticSign" .. type
vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" }) vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" })
end end
-- For some reason I was having trouble getting this to work inside the on-attach, so it's here. -- For some reason I was having trouble getting this to work inside the on-attach, so it's here.
vim.keymap.set("n", "<leader>rn", vim.lsp.buf.rename, { desc = "[R]e-[N]ame" }) vim.keymap.set("n", "<leader>rn", vim.lsp.buf.rename, { desc = "[R]e-[N]ame" })
end, end,
}, },
} }