Compare commits

...

6 Commits

Author SHA1 Message Date
409
603f955549 feat(lsp): fix svelte updates not reflecting 2024-10-18 09:49:24 +02:00
409
9a25573f5d feat(lsp): hyprland support 2024-10-18 09:48:49 +02:00
409
bb91351c40 chore(lsp): remove old print statement 2024-10-18 09:40:23 +02:00
409
c5098239d1 feat(theme): transparency 2024-10-18 09:39:59 +02:00
409
4e3efa3293 chore(comments): remove old commented keybinds 2024-10-18 09:38:36 +02:00
409
f96a7856a7 chore: lazy-lock.json 2024-10-18 09:38:30 +02:00
5 changed files with 104 additions and 43 deletions

View File

@@ -38,7 +38,7 @@
"obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" }, "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" },
"oil.nvim": { "branch": "master", "commit": "39dbf875861449cf09e936fa80073f3413e9439c" }, "oil.nvim": { "branch": "master", "commit": "39dbf875861449cf09e936fa80073f3413e9439c" },
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
"render-markdown.nvim": { "branch": "main", "commit": "7808306438e51d7222534759011cddedf36ce580" }, "render-markdown.nvim": { "branch": "main", "commit": "bea6f2078e34abdf5c2632f593651bb13205477f" },
"tailwind-tools.nvim": { "branch": "master", "commit": "89e560705ecd49607c63c277935c5264bb770d57" }, "tailwind-tools.nvim": { "branch": "master", "commit": "89e560705ecd49607c63c277935c5264bb770d57" },
"telescope.nvim": { "branch": "master", "commit": "df534c3042572fb958586facd02841e10186707c" }, "telescope.nvim": { "branch": "master", "commit": "df534c3042572fb958586facd02841e10186707c" },
"tiny-devicons-auto-colors.nvim": { "branch": "main", "commit": "a39fa4c92268832f6034306793b8acbfec2a7549" }, "tiny-devicons-auto-colors.nvim": { "branch": "main", "commit": "a39fa4c92268832f6034306793b8acbfec2a7549" },

View File

@@ -35,22 +35,6 @@ return {
":Neogen class<CR>", ":Neogen class<CR>",
desc = "Document class", desc = "Document class",
}, },
--[[ {
"<C-k>",
function()
require("neogen").jump_next()
end,
mode = "i",
desc = "Next documentation field",
}, ]]
--[[ {
"<C-j>",
function()
require("neogen").jump_prev()
end,
mode = "i",
desc = "Previous documentation field",
}, ]]
}, },
}, },
{ {

View File

@@ -15,9 +15,20 @@ return {
config = function() config = function()
local lsp = require("lsp-zero") local lsp = require("lsp-zero")
-- Hyprlang LSP
vim.api.nvim_create_autocmd({ "BufEnter", "BufWinEnter" }, {
pattern = { "*.hl", "hypr*.conf" },
callback = function(event)
vim.lsp.start({
name = "hyprlang",
cmd = { "hyprls" },
root_dir = vim.fn.getcwd(),
})
end,
})
lsp.on_attach(function(client, bufnr) lsp.on_attach(function(client, bufnr)
if vim.bo[bufnr].filetype == "markdown" then if vim.bo[bufnr].filetype == "markdown" then
print('markdown')
return return
end end
@@ -57,30 +68,6 @@ return {
vim.lsp.buf.signature_help() vim.lsp.buf.signature_help()
end, lsp_opts) end, lsp_opts)
end) end)
require("mason-lspconfig").setup({
ensure_installed = {
"tsserver",
"eslint",
"lua_ls",
"jsonls",
"html",
"tailwindcss",
"pylsp",
"dockerls",
"bashls",
"marksman",
"rust_analyzer",
},
handlers = {
function(server_name)
require("lspconfig")[server_name].setup({})
end,
lua_ls = function()
require("lspconfig").lua_ls.setup(lsp.nvim_lua_ls())
end,
},
})
end, end,
}, },
{ {
@@ -101,12 +88,46 @@ return {
enabled = false, enabled = false,
}, },
servers = { servers = {
tsserver = { vtsls = {
filetypes = {
"javascript",
"javascriptreact",
"javascript.jsx",
"typescript",
"typescriptreact",
"typescript.tsx",
},
settings = { settings = {
vtsls = {
ts_ls = {
globalPlugins = {
{
name = "typescript-svelte-plugin",
location = vim.fn.getcwd() .. "/node_modules/typescript-svelte-plugin",
enableForWorkspaceTypeScriptVersions = true,
},
},
},
tsserver = {
globalPlugins = {
{
name = "typescript-svelte-plugin",
location = vim.fn.getcwd() .. "/node_modules/typescript-svelte-plugin",
enableForWorkspaceTypeScriptVersions = true,
},
},
},
},
typescript = { typescript = {
preferences = { preferences = {
quoteStyle = "single", quoteStyle = "single",
}, },
updateImportsOnFileMove = {
enabled = "always",
},
suggest = {
completeFunctionCalls = true,
},
}, },
javascript = { javascript = {
preferences = { preferences = {
@@ -115,9 +136,18 @@ return {
}, },
}, },
}, },
svelte = {
capabilities = {
workspace = {
didChangeWatchedFiles = { dynamicRegistration = true },
},
},
},
}, },
}, },
config = function(_, opts) config = function(_, opts)
local lsp = require("lsp-zero")
vim.api.nvim_create_autocmd("LspAttach", { vim.api.nvim_create_autocmd("LspAttach", {
callback = function(args) callback = function(args)
local buffer = args.buf local buffer = args.buf
@@ -131,6 +161,16 @@ return {
then then
vim.lsp.inlay_hint.enable(true) vim.lsp.inlay_hint.enable(true)
end end
if client ~= nil and client.name == "svelte" then
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("$/onDidChangeTsOrJsFile", { uri = ctx.match })
end,
})
end
end, end,
}) })
@@ -139,6 +179,34 @@ return {
require("lspconfig.ui.windows").default_options = { require("lspconfig.ui.windows").default_options = {
border = "single", border = "single",
} }
local lspconfig = require("lspconfig")
require("mason-lspconfig").setup({
ensure_installed = {
"vtsls",
"eslint",
"lua_ls",
"jsonls",
"html",
"tailwindcss",
"pylsp",
"dockerls",
"bashls",
"marksman",
"rust_analyzer",
},
handlers = {
function(server_name)
if lspconfig[server_name] ~= nil then
lspconfig[server_name].setup(opts.servers[server_name] or {})
end
end,
lua_ls = function()
require("lspconfig").lua_ls.setup(lsp.nvim_lua_ls())
end,
},
})
end, end,
}, },
{ {

View File

@@ -5,6 +5,9 @@ return {
lazy = false, lazy = false,
priority = 1000, priority = 1000,
config = function() config = function()
require("dracula").setup({
transparent_bg = true,
})
vim.cmd.colorscheme("dracula") vim.cmd.colorscheme("dracula")
vim.api.nvim_set_hl(0, "QuickFixLine", { link = "Visual" }) vim.api.nvim_set_hl(0, "QuickFixLine", { link = "Visual" })
@@ -19,6 +22,8 @@ return {
vim.api.nvim_set_hl(0, "TabLineSel", { fg = "#282a36", bg = "#50fa7b", bold = true }) vim.api.nvim_set_hl(0, "TabLineSel", { fg = "#282a36", bg = "#50fa7b", bold = true })
vim.api.nvim_set_hl(0, "DashboardHeader", { fg = "#50fa7b" }) vim.api.nvim_set_hl(0, "DashboardHeader", { fg = "#50fa7b" })
vim.api.nvim_set_hl(0, "DashboardShortCut", { fg = "#bd93f9" }) vim.api.nvim_set_hl(0, "DashboardShortCut", { fg = "#bd93f9" })
vim.api.nvim_set_hl(0, "CmpItemAbbr", { bg = "none" })
vim.api.nvim_set_hl(0, "CmpItemAbbrMatch", { fg = "#50fa7b", bg = "none" })
end, end,
}, },
} }

View File

@@ -39,3 +39,7 @@ vim.opt.showmode = false
vim.opt.concealcursor = "n" vim.opt.concealcursor = "n"
vim.opt.conceallevel = 0 vim.opt.conceallevel = 0
vim.g.lsp_zero_ui_float_border = "single" vim.g.lsp_zero_ui_float_border = "single"
vim.filetype.add({
pattern = { [".*/hypr/.*%.conf"] = "hyprlang" },
})