astro-nvim-v3 - change color line

This commit is contained in:
huyjaky
2025-01-06 12:17:40 +07:00
parent 9d867126d3
commit c0d55ff45e
9 changed files with 69 additions and 44 deletions

View File

@@ -4,7 +4,7 @@
"LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
"aerial.nvim": { "branch": "master", "commit": "1160fb7a15a34b03b7381d95d45560712b5f19d0" }, "aerial.nvim": { "branch": "master", "commit": "1160fb7a15a34b03b7381d95d45560712b5f19d0" },
"alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" }, "alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" },
"astrocommunity": { "branch": "main", "commit": "31e12fdbcba1ae7094d8b027c6e65d01e6f133e9" }, "astrocommunity": { "branch": "main", "commit": "f913ab6af1fa50410f7dea05a9f17bd96bcc3d63" },
"astrocore": { "branch": "main", "commit": "0fcaac66d115948605c14eaf45a41d3923eaafeb" }, "astrocore": { "branch": "main", "commit": "0fcaac66d115948605c14eaf45a41d3923eaafeb" },
"astrolsp": { "branch": "main", "commit": "2f6b0a4059775a1dac011d2944dd41fd4a8fe7a8" }, "astrolsp": { "branch": "main", "commit": "2f6b0a4059775a1dac011d2944dd41fd4a8fe7a8" },
"astrotheme": { "branch": "main", "commit": "41b7d8430a55fd771e41bd763af4c3fd1c2fc0b5" }, "astrotheme": { "branch": "main", "commit": "41b7d8430a55fd771e41bd763af4c3fd1c2fc0b5" },
@@ -43,7 +43,7 @@
"mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" },
"mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" },
"mini.bufremove": { "branch": "main", "commit": "1ee294a97e091d3cf967974df622c0d887890dc2" }, "mini.bufremove": { "branch": "main", "commit": "1ee294a97e091d3cf967974df622c0d887890dc2" },
"mini.icons": { "branch": "main", "commit": "6787321f70d674a481776b7cc2c781fb7002c644" }, "mini.icons": { "branch": "main", "commit": "1c79feb7478ca773fa3dac5cadf43ced9180e861" },
"mini.indentscope": { "branch": "main", "commit": "da9af64649e114aa79480c238fd23f6524bc0903" }, "mini.indentscope": { "branch": "main", "commit": "da9af64649e114aa79480c238fd23f6524bc0903" },
"mini.move": { "branch": "main", "commit": "4caa1c212f5ca3d1633d21cfb184808090ed74b1" }, "mini.move": { "branch": "main", "commit": "4caa1c212f5ca3d1633d21cfb184808090ed74b1" },
"mini.surround": { "branch": "main", "commit": "aa5e245829dd12d8ff0c96ef11da28681d6049aa" }, "mini.surround": { "branch": "main", "commit": "aa5e245829dd12d8ff0c96ef11da28681d6049aa" },
@@ -80,7 +80,7 @@
"telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" }, "telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" },
"todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
"transparent.nvim": { "branch": "main", "commit": "8a2749a2fa74f97fe6557f61b89ac7fd873f3c21" }, "transparent.nvim": { "branch": "main", "commit": "8a2749a2fa74f97fe6557f61b89ac7fd873f3c21" },
"treesj": { "branch": "main", "commit": "94f6df623f2d15630b1b617abff39962024cb501" }, "treesj": { "branch": "main", "commit": "9006b6b32da607519845c6540073a95a304b2e01" },
"trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" }, "trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" },
"ultimate-autopair.nvim": { "branch": "v0.6", "commit": "9e3209190c22953566ae4e6436ad2b4ff4dabb95" }, "ultimate-autopair.nvim": { "branch": "v0.6", "commit": "9e3209190c22953566ae4e6436ad2b4ff4dabb95" },
"vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" }, "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" },

View File

@@ -27,7 +27,7 @@ return {
jedi_language_server = { jedi_language_server = {
init_options = { init_options = {
completion = { completion = {
-- disableSnippets = true, disableSnippets = true,
}, },
diagnostics = { diagnostics = {
enable = false, enable = false,
@@ -36,6 +36,8 @@ return {
autoImportModules = { autoImportModules = {
"numpy", "numpy",
"pandas", "pandas",
"torch",
"sklearn"
}, },
}, },
}, },
@@ -44,6 +46,7 @@ return {
init_options = { init_options = {
settings = { settings = {
lint = { lint = {
unfixable = { "F401" },
select = { select = {
"ALL", "ALL",
}, },
@@ -77,34 +80,16 @@ return {
"FIX002", "FIX002",
"N803", "N803",
"PD901", "PD901",
"F401", -- "F401",
"I001", "I001",
"RET504", "RET504",
}, },
fixable = { "ALL" },
}, },
args = {}, args = {},
}, },
}, },
}, },
pylsp = {
settings = {
pylsp = {
plugins = {
pyflakes = { enabled = false },
pycodestyle = { enabled = false },
autopep8 = { enabled = false },
yapf = { enabled = false },
mccabe = { enabled = false },
-- pylint = { enabled = false },
pylsp_mypy = { enabled = false },
pylsp_black = { enabled = false },
pylsp_isort = { enabled = false },
},
},
},
},
}, },
-- customize how language servers are attached -- customize how language servers are attached
handlers = { handlers = {
@@ -189,9 +174,11 @@ return {
on_attach = function(client, bufnr) on_attach = function(client, bufnr)
-- this would disable semanticTokensProvider for all clients -- this would disable semanticTokensProvider for all clients
-- client.server_capabilities.semanticTokensProvider = nil -- client.server_capabilities.semanticTokensProvider = nil
-- Disable ruff_lsp hover in favor of pyright -- Disable ruff_lsp hover in favor of pyright
if client.name == "ruff_lsp" then client.server_capabilities.hoverProvider = false end if client.name == "ruff_lsp" then client.server_capabilities.hoverProvider = false end
-- Disable completion feature of pyright
if client.name == "basedpyright" then client.server_capabilities.completionProvider = false end
end, end,
}, },
} }

View File

@@ -18,10 +18,23 @@ return {
cmp.setup.filetype("python", { cmp.setup.filetype("python", {
sources = cmp.config.sources { sources = cmp.config.sources {
{ name = "nvim_lsp", priority = 700 }, { name = "nvim_lsp", priority = 700},
{ name = "buffer", priority = 500 }, { name = "buffer", priority = 500 },
{ name = "path", priority = 250 }, { name = "path", priority = 250 },
}, },
sorting = {
comparators = {
cmp.config.compare.offset,
cmp.config.compare.exact,
cmp.config.compare.score,
cmp.config.compare.kind,
cmp.config.compare.sort_text,
cmp.config.compare.length,
cmp.config.compare.order,
},
priority_weight = 1000
},
}) })
return require("astrocore").extend_tbl(opts, { return require("astrocore").extend_tbl(opts, {

View File

@@ -6,18 +6,18 @@ return {
end, end,
settings = { settings = {
basedpyright = { basedpyright = {
disableOrganizeImports = true, disableOrganizeImports = true,
-- disableLanguageServices = true, -- disableLanguageServices = true,
-- disableTaggedHints = true, autoImportCompletions = false,
disableTaggedHints = true,
useLibraryCodeForTypes = false,
analysis = { analysis = {
-- diagnosticMode = "workspace", -- diagnosticMode = "workspace",
diagnosticMode = "openFilesOnly", diagnosticMode = "openFilesOnly",
typeCheckingMode = "basic", typeCheckingMode = "basic",
autoImportCompletions = false, autoImportCompletions = false,
autoSearchPath = false, autoSearchPath = false,
logLevel = "error", indexing = false,
indexing = true,
inlayHints = { inlayHints = {
variableTypes = true, variableTypes = true,
functionReturnTypes = true, functionReturnTypes = true,

View File

@@ -140,12 +140,12 @@ M.statusline = {
hl = { fg = "text_fg" }, hl = { fg = "text_fg" },
padding = { right = 1 }, padding = { right = 1 },
}, },
status.component.lsp { -- status.component.lsp {
lsp_client_names = { -- lsp_client_names = {
icon = { kind = "ActiveLSP", padding = { right = 1 } }, -- icon = { kind = "ActiveLSP", padding = { right = 1 } },
}, -- },
surround = { separator = "left" }, -- surround = { separator = "left" },
}, -- },
{ {
status.component.builder { status.component.builder {
{ provider = get_icon "ScrollText" }, { provider = get_icon "ScrollText" },

View File

@@ -11,11 +11,11 @@ return {
DiagnosticVirtualTextInfo = { fg = get_hlgroup("DiagnosticInfo").fg, bg = "none" }, DiagnosticVirtualTextInfo = { fg = get_hlgroup("DiagnosticInfo").fg, bg = "none" },
DiagnosticVirtualTextWarn = { fg = get_hlgroup("DiagnosticWarn").fg, bg = "none" }, DiagnosticVirtualTextWarn = { fg = get_hlgroup("DiagnosticWarn").fg, bg = "none" },
CursorLineNr = { fg = "#FFD700", bg = "none", bold = true }, CursorLineNr = { fg = "#FFD700", bg = "none", bold = true },
CursorLine = { fg = "none", bg = "#004C4C", bold = true },
Visual = { fg = "#000000", bg = "#FFFFFF", bold = true }, Visual = { fg = "#000000", bg = "#FFFFFF", bold = true },
-- remove background of inlay hints -- remove background of inlay hints
LspInlayHint = { fg = get_hlgroup("LspInlayHint").fg, bg = "none" }, LspInlayHint = { fg = get_hlgroup("LspInlayHint").fg, bg = "none" },
} }
return hl return hl
@@ -24,4 +24,3 @@ return {
-- Normal = { bg = "#000000" }, -- Normal = { bg = "#000000" },
}, },
} }

View File

@@ -1,6 +1,5 @@
-- Plugins to disable -- Plugins to disable
return { return {
{ "nvim-neo-tree/neo-tree.nvim", enabled = true },
{ "s1n7ax/nvim-window-picker", enabled = false }, { "s1n7ax/nvim-window-picker", enabled = false },
{ "akinsho/toggleterm.nvim", enabled = false }, { "akinsho/toggleterm.nvim", enabled = false },
{ "NvChad/nvim-colorizer.lua", enabled = false }, { "NvChad/nvim-colorizer.lua", enabled = false },
@@ -15,19 +14,26 @@ return {
{ "lukas-reineke/indent-blankline.nvim", enabled = false }, { "lukas-reineke/indent-blankline.nvim", enabled = false },
{ "chipsenkbeil/distant.nvim", enabled = false }, { "chipsenkbeil/distant.nvim", enabled = false },
{ "gen740/SmoothCursor.nvim", enabled = false }, { "gen740/SmoothCursor.nvim", enabled = false },
{ "stevearc/resession.nvim", enabled = true },
{ "AstroNvim/astrotheme", enabled = false }, { "AstroNvim/astrotheme", enabled = false },
{ "echasnovski/mini.move", enabled = true },
{ "scottmckendry/cyberdream.nvim", enabled = false }, { "scottmckendry/cyberdream.nvim", enabled = false },
{ "HiPhish/rainbow-delimiters.nvim", enabled = true }, { "xiyaowong/transparent.nvim", enabled = false },
{ "xiyaowong/transparent.nvim", enabled = true },
{ "MagicDuck/grug-far.nvim", enabled = false }, { "MagicDuck/grug-far.nvim", enabled = false },
{ "loctvl842/monokai-pro.nvim", enabled = false }, { "loctvl842/monokai-pro.nvim", enabled = false },
{ "xiyaowong/transparent.nvim", enabled = false }, { "xiyaowong/transparent.nvim", enabled = false },
{ "iamcco/markdown-preview.nvim", enabled = false }, { "iamcco/markdown-preview.nvim", enabled = false },
{ "max397574/better-escape.nvim", enabled = false }, { "max397574/better-escape.nvim", enabled = false },
{ "ribru17/bamboo.nvim", enabled = true },
{ "hinell/duplicate.nvim", enabled = false }, { "hinell/duplicate.nvim", enabled = false },
{ "CRAG666/code_runner.nvim", enabled = false },
-- interface
{ "HiPhish/rainbow-delimiters.nvim", enabled = true },
{ "ribru17/bamboo.nvim", enabled = true },
-- service
{ "stevearc/resession.nvim", enabled = true },
{ "echasnovski/mini.move", enabled = true },
{ "nvim-neo-tree/neo-tree.nvim", enabled = true },
{ "folke/flash.nvim", enabled = true },
} }

View File

@@ -14,7 +14,7 @@ return {
}) })
opts.highlight = { opts.highlight = {
enable = true, enable = true,
disable = { "c", "rust", "tsx", "javascript"}, disable = { "c", "rust", "tsx", "javascript" },
additional_vim_regex_highlighting = false, additional_vim_regex_highlighting = false,
custom_captures = { custom_captures = {
-- Highlight local variables -- Highlight local variables

20
lua/plugins/whichkey.lua Normal file
View File

@@ -0,0 +1,20 @@
return {
"folke/which-key.nvim",
event = "VeryLazy",
opts = {
-- your configuration comes here
-- or leave it empty to use the default settings
-- refer to the configuration section below
preset = "helix",
layout = {
height = { min = 6 },
},
},
keys = {
{
"<leader>?",
function() require("which-key").show { global = false } end,
desc = "Buffer Local Keymaps (which-key)",
},
},
}