post-update

This commit is contained in:
hakase
2025-04-05 10:09:03 -05:00
parent 6bcb31995a
commit 2a58ee17e7
4 changed files with 37 additions and 9 deletions
+16
View File
@@ -78,3 +78,19 @@ vim.g.clipboard = {
['*'] = require('vim.ui.clipboard.osc52').paste('*'),
},
}
-- Ruff and pyright cross-compatibility
vim.api.nvim_create_autocmd("LspAttach", {
group = vim.api.nvim_create_augroup('lsp_attach_disable_ruff_hover', { clear = true }),
callback = function(args)
local client = vim.lsp.get_client_by_id(args.data.client_id)
if client == nil then
return
end
if client.name == 'ruff' then
-- Disable hover in favor of Pyright
client.server_capabilities.hoverProvider = false
end
end,
desc = 'LSP: Disable hover capability from Ruff',
})
+3
View File
@@ -5,6 +5,9 @@ local options = {
css = { "prettier" },
html = { "prettier" },
go = { "goimports", "gofmt" },
bash = {"beautysh"},
sh = {"beautysh"},
zsh = {"beautysh"},
},
-- format_on_save = {
+15 -9
View File
@@ -17,7 +17,7 @@ for _, lsp in ipairs(servers) do
end
-- typescript
lspconfig.tsserver.setup {
lspconfig.ts_ls.setup {
on_attach = on_attach,
on_init = on_init,
capabilities = capabilities,
@@ -54,17 +54,23 @@ lspconfig.gopls.setup {
}
---- ruff_lsp and pyright compatibility
local on_attach = function(client, bufnr)
if client.name == 'ruff_lsp' then
-- hover in favor of Pyright
client.server_capabilities.hoverProvider = false
end
end
lspconfig.ruff_lsp.setup{
-- local on_attach = function(client, bufnr)
-- if client.name == 'ruff_lsp' then
-- -- hover in favor of Pyright
-- client.server_capabilities.hoverProvider = false
-- end
-- end
--
lspconfig.ruff.setup{
on_attach = on_attach,
on_init = on_init,
capabilities = capabilities,
init_options = {
settings = {
}
},
}
+3
View File
@@ -3,6 +3,7 @@ require "nvchad.mappings"
-- add yours here
local map = vim.keymap.set
local keymap = vim.api.nvim_set_keymap
map("n", ";", ":", { desc = "CMD enter command mode" })
map("i", "jk", "<ESC>")
@@ -10,6 +11,8 @@ map("i", "jk", "<ESC>")
map("n", "<leader>md", ":MarkdownPreviewToggle <cr>")
map("n", "<leader>tl", ":TodoLocList <cr>")
map("n", "<leader>td", ":TodoQuickFix <cr>")
map("n", "<leader>cr", ":!python3 % <cr>")
-- map({ "n", "i", "v" }, "<C-s>", "<cmd> w <cr>")