From 193a915d3a4f1e8ab00a0bdd012c19cc3e75797f Mon Sep 17 00:00:00 2001 From: huyjaky Date: Thu, 2 Jan 2025 21:15:25 +0700 Subject: [PATCH] astro-nvim-v3 - fix linter --- init.lua | 1 - lua/plugins/astrolsp.lua | 8 +- lua/plugins/cmp.lua | 18 +++++ lua/plugins/conda.lua | 5 -- .../configs/lsp/config/basedpyright.lua | 69 ++++++++--------- lua/plugins/indent-scope.lua | 1 - lua/plugins/mason.lua | 4 +- lua/plugins/none-ls.lua | 4 - lua/plugins/smooth-cursor.lua | 75 ------------------- lua/plugins/treesitter.lua | 2 +- 10 files changed, 61 insertions(+), 126 deletions(-) delete mode 100644 lua/plugins/conda.lua delete mode 100644 lua/plugins/smooth-cursor.lua diff --git a/init.lua b/init.lua index 7570d62..fe58f8f 100644 --- a/init.lua +++ b/init.lua @@ -15,7 +15,6 @@ if not pcall(require, "lazy") then vim.cmd.quit() end - require "lazy_setup" require "polish" diff --git a/lua/plugins/astrolsp.lua b/lua/plugins/astrolsp.lua index 37150e8..c2d5b9e 100644 --- a/lua/plugins/astrolsp.lua +++ b/lua/plugins/astrolsp.lua @@ -22,15 +22,19 @@ return { ---@diagnostic disable: missing-fields config = { -- clangd = require "plugins.configs.lsp.config.clangd", - -- basedpyright = require "plugins.configs.lsp.config.basedpyright", + basedpyright = require "plugins.configs.lsp.config.basedpyright", + jedi_language_server = { init_options = { completion = { disableSnippets = true, }, + -- diagnostics = { + -- enable = fa, + -- } }, }, - ruff_lsp = { + ruff = { init_options = { settings = { args = { diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua index ec57633..777e009 100644 --- a/lua/plugins/cmp.lua +++ b/lua/plugins/cmp.lua @@ -74,4 +74,22 @@ return { }) end, }, + -- { + -- "neovim/nvim-lspconfig", + -- opts = function(_, opts) + -- local lspconfig = require "lspconfig" + + -- -- Setup `jedi-language-server` for Python files + -- lspconfig.jedi_language_server.setup { + -- on_attach = opts.on_attach, + -- capabilities = opts.capabilities, + -- filetypes = { "python" }, + -- } + + -- -- Optionally, you can disable pyright + -- lspconfig.pyright.setup { + -- filetypes = {}, + -- } + -- end, + -- }, } diff --git a/lua/plugins/conda.lua b/lua/plugins/conda.lua deleted file mode 100644 index 59780ef..0000000 --- a/lua/plugins/conda.lua +++ /dev/null @@ -1,5 +0,0 @@ - -return { - "kmontocam/nvim-conda", - dependencies = { "nvim-lua/plenary.nvim" }, -} diff --git a/lua/plugins/configs/lsp/config/basedpyright.lua b/lua/plugins/configs/lsp/config/basedpyright.lua index dbbcab8..1f256fb 100644 --- a/lua/plugins/configs/lsp/config/basedpyright.lua +++ b/lua/plugins/configs/lsp/config/basedpyright.lua @@ -1,34 +1,35 @@ --- return { --- before_init = function(_, c) --- if not c.settings then c.settings = {} end --- if not c.settings.python then c.settings.python = {} end --- c.settings.python.pythonPath = vim.fn.exepath "python" --- end, --- settings = { --- basedpyright = { --- analysis = { --- -- diagnosticMode = "workspace", --- diagnosticMode = "off", --- typeCheckingMode = "basic", --- autoImportCompletions = true, --- autoSearchPath = true, --- inlayHints = { --- variableTypes = true, --- functionReturnTypes = true, --- callArgumentNames = true, --- pytestParameters = true, --- }, --- useLibraryCodeForTypes = true, --- diagnosticSeverityOverrides = { --- reportUnusedImport = "information", --- reportUnusedFunction = "information", --- reportUnusedVariable = "information", --- reportGeneralTypeIssues = "none", --- reportOptionalMemberAccess = "none", --- reportOptionalSubscript = "none", --- reportPrivateImportUsage = "none", --- }, --- }, --- }, --- }, --- } +return { + before_init = function(_, c) + if not c.settings then c.settings = {} end + if not c.settings.python then c.settings.python = {} end + c.settings.python.pythonPath = vim.fn.exepath "python" + end, + settings = { + basedpyright = { + pyright = {enabled = false}, + analysis = { + -- diagnosticMode = "workspace", + diagnosticMode = "openFilesOnly", + typeCheckingMode = "basic", + autoImportCompletions = false, + autoSearchPath = true, + inlayHints = { + variableTypes = true, + functionReturnTypes = true, + callArgumentNames = true, + pytestParameters = true, + }, + useLibraryCodeForTypes = true, + diagnosticSeverityOverrides = { + reportUnusedImport = "information", + reportUnusedFunction = "information", + reportUnusedVariable = "information", + -- reportGeneralTypeIssues = "none", + -- reportOptionalMemberAccess = "none", + -- reportOptionalSubscript = "none", + -- reportPrivateImportUsage = "none", + }, + }, + }, + }, +} diff --git a/lua/plugins/indent-scope.lua b/lua/plugins/indent-scope.lua index 9cc3a9a..273de9d 100644 --- a/lua/plugins/indent-scope.lua +++ b/lua/plugins/indent-scope.lua @@ -25,7 +25,6 @@ return { "echasnovski/mini.indentscope", event = "User AstroFile", opts = function() - vim.api.nvim_set_hl(0, "MiniIndentscopeSymbol", { fg = "#FF4500" }) -- Replace #FF4500 with your desired color return { options = { try_as_border = true, border = "both" }, diff --git a/lua/plugins/mason.lua b/lua/plugins/mason.lua index 92ce191..3bac012 100644 --- a/lua/plugins/mason.lua +++ b/lua/plugins/mason.lua @@ -12,9 +12,7 @@ return { "lua_ls", "jedi_language_server", "ruff", - -- "clangd", - -- "basedpyright", - -- "ruff", + "basedpyright", }) end, }, diff --git a/lua/plugins/none-ls.lua b/lua/plugins/none-ls.lua index 4f51935..9882155 100644 --- a/lua/plugins/none-ls.lua +++ b/lua/plugins/none-ls.lua @@ -12,10 +12,6 @@ return { -- https://github.com/nvimtools/none-ls.nvim/tree/main/lua/null-ls/builtins/diagnostics opts.sources = { -- Set a formatter - null_ls.builtins.formatting.stylua, - null_ls.builtins.formatting.clang_format, - -- null_ls.builtins.formatting.black, - null_ls.builtins.formatting.prettier, } return opts end, diff --git a/lua/plugins/smooth-cursor.lua b/lua/plugins/smooth-cursor.lua deleted file mode 100644 index aa6ef32..0000000 --- a/lua/plugins/smooth-cursor.lua +++ /dev/null @@ -1,75 +0,0 @@ -return { - "gen740/SmoothCursor.nvim", - config = function() - require("smoothcursor").setup { - type = "default", -- Cursor movement calculation method, choose "default", "exp" (exponential) or "matrix". - - cursor = "", -- Cursor shape (requires Nerd Font). Disabled in fancy mode. - texthl = "SmoothCursor", -- Highlight group. Default is { bg = nil, fg = "#FFD400" }. Disabled in fancy mode. - linehl = nil, -- Highlights the line under the cursor, similar to 'cursorline'. "CursorLine" is recommended. Disabled in fancy mode. - - fancy = { - enable = true, -- enable fancy mode - head = { cursor = "▷", texthl = "SmoothCursor", linehl = nil }, -- false to disable fancy head - body = { - { cursor = "󰝥", texthl = "SmoothCursorRed" }, - { cursor = "󰝥", texthl = "SmoothCursorOrange" }, - { cursor = "●", texthl = "SmoothCursorYellow" }, - { cursor = "●", texthl = "SmoothCursorGreen" }, - { cursor = "•", texthl = "SmoothCursorAqua" }, - { cursor = ".", texthl = "SmoothCursorBlue" }, - { cursor = ".", texthl = "SmoothCursorPurple" }, - }, - tail = { cursor = nil, texthl = "SmoothCursor" }, -- false to disable fancy tail - }, - - matrix = { -- Loaded when 'type' is set to "matrix" - head = { - -- Picks a random character from this list for the cursor text - cursor = require "smoothcursor.matrix_chars", - -- Picks a random highlight from this list for the cursor text - texthl = { - "SmoothCursor", - }, - linehl = nil, -- No line highlight for the head - }, - body = { - length = 6, -- Specifies the length of the cursor body - -- Picks a random character from this list for the cursor body text - cursor = require "smoothcursor.matrix_chars", - -- Picks a random highlight from this list for each segment of the cursor body - texthl = { - "SmoothCursorGreen", - }, - }, - tail = { - -- Picks a random character from this list for the cursor tail (if any) - cursor = nil, - -- Picks a random highlight from this list for the cursor tail - texthl = { - "SmoothCursor", - }, - }, - unstop = false, -- Determines if the cursor should stop or not (false means it will stop) - }, - - autostart = true, -- Automatically start SmoothCursor - always_redraw = true, -- Redraw the screen on each update - flyin_effect = nil, -- Choose "bottom" or "top" for flying effect - speed = 25, -- Max speed is 100 to stick with your current position - intervals = 35, -- Update intervals in milliseconds - priority = 10, -- Set marker priority - timeout = 3000, -- Timeout for animations in milliseconds - threshold = 3, -- Animate only if cursor moves more than this many lines - max_threshold = nil, -- If you move more than this many lines, don't animate (if `nil`, deactivate check) - disable_float_win = false, -- Disable in floating windows - enabled_filetypes = nil, -- Enable only for specific file types, e.g., { "lua", "vim" } - disabled_filetypes = nil, -- Disable for these file types, ignored if enabled_filetypes is set. e.g., { "TelescopePrompt", "NvimTree" } - -- Show the position of the latest input mode positions. - -- A value of "enter" means the position will be updated when entering the mode. - -- A value of "leave" means the position will be updated when leaving the mode. - -- `nil` = disabled - show_last_positions = nil, - } - end, -} diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index 9891436..55af936 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -14,7 +14,7 @@ return { }) opts.highlight = { enable = true, - disable = { "c", "rust", "tsx", "javascript"}, + disable = { "c", "rust", "tsx", "javascript", "python"}, additional_vim_regex_highlighting = false, custom_captures = { -- Highlight local variables