From d2afccfda51f0a13cce8e659032fd5c177b721f0 Mon Sep 17 00:00:00 2001 From: David Luevano Alvarado <david@luevano.xyz> Date: Sun, 16 Mar 2025 01:49:12 -0600 Subject: fix: use new ruff lsp, update colorscheme --- lua/plugins/lspconfig.lua | 8 ++++---- lua/plugins/theme.lua | 11 +++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua index ec41a3f..5192a36 100644 --- a/lua/plugins/lspconfig.lua +++ b/lua/plugins/lspconfig.lua @@ -36,7 +36,7 @@ local servers = { allFeatures = true, }, }, - ruff_lsp = { + ruff = { init_options = { settings = { -- Any extra CLI arguments for `ruff` go here. @@ -79,7 +79,7 @@ return { 'gopls', 'rust-analyzer', 'mypy', - 'ruff-lsp', + 'ruff', 'pyright', 'lua-language-server', 'shfmt', @@ -120,7 +120,7 @@ return { -- TODO: change keybinds to the autocmd suggested by the lspconfig github local on_attach = function(client, bufnr) - if client.name == 'ruff_lsp' then + if client.name == 'ruff' then -- Disable hover in favor of Pyright client.server_capabilities.hoverProvider = false end @@ -208,7 +208,7 @@ return { setup_server('gopls') setup_server('rust_analyzer') setup_server('pyright') - setup_server('ruff_lsp') + setup_server('ruff') setup_server('lua_ls') setup_server('bashls') -- assumes localhost is mirrored (networkingMode=mirrored in .wslconfig) diff --git a/lua/plugins/theme.lua b/lua/plugins/theme.lua index 1085034..9abeb93 100644 --- a/lua/plugins/theme.lua +++ b/lua/plugins/theme.lua @@ -11,6 +11,7 @@ return { borders = true, errors = { mode = 'bg' }, search = { theme = 'vim' }, + styles = { -- Style to be applied to different syntax groups -- Value is any valid attr-list value for `:help nvim_set_hl` @@ -18,12 +19,22 @@ return { keywords = {}, functions = {}, variables = {}, + errors = {}, + -- To customize lualine/bufferline bufferline = { current = {}, modified = { italic = true }, }, }, + + -- Definitions from the old nord theme I was using: + -- https://github.com/shaunsingh/nord.nvim/blob/master/lua/nord/theme.lua + on_highlights = function(hl, c) + -- Treesitter: https://github.com/gbprod/nord.nvim/blob/main/lua/nord/treesitter.lua + -- old theme was in yellow, changed the default to purple to match better the newer theme + hl["@constant"] = { fg = c.aurora.purple } + end, }) vim.cmd.colorscheme('nord') -- cgit v1.2.3-70-g09d2