Refactor LSP configuration and remove Kite plugin. Updated key mappings for comments and added Python-specific tab settings. Enhanced Treesitter installation list and integrated Ruff LSP for Python. Cleaned up Kite-related files and configurations.

Author: fl4viooliveira

init.lua

@@ -151,12 +151,12 @@ require('lazy').setup({
     'numToStr/Comment.nvim',
     opts = {
       toggler = {
-        line = '<leader>/',  -- Changed from <gc>
-        block = '<leader>b', -- Changed from <gb>
+        line = 'gc',
+        block = 'gb',
       },
       opleader = {
-        line = '<leader>/',  -- Optional
-        block = '<leader>B', -- Optional
+        line = 'gc',
+        block = 'gb',
       },
     }
   },
@@ -216,6 +216,15 @@ vim.o.softtabstop = 2
 vim.o.shiftwidth = 2
 vim.o.expandtab = true
 
+vim.api.nvim_create_autocmd('FileType', {
+  pattern = { 'python' },
+  callback = function()
+    vim.bo.tabstop = 4
+    vim.bo.softtabstop = 4
+    vim.bo.shiftwidth = 4
+  end,
+})
+
 -- Basic keymaps
 vim.keymap.set({ 'n', 'v' }, '<Space>', '<Nop>', { silent = true })
 vim.keymap.set('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
@@ -257,7 +266,27 @@ end, { desc = '[/] Fuzzily search in current buffer' })
 -- Treesitter configuration
 vim.defer_fn(function()
   require('nvim-treesitter.configs').setup {
-    ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'javascript', 'typescript', 'vimdoc', 'vim', 'bash' },
+    ensure_installed = {
+      'c',
+      'cpp',
+      'go',
+      'lua',
+      'python',
+      'rust',
+      'tsx',
+      'javascript',
+      'typescript',
+      'vimdoc',
+      'vim',
+      'bash',
+      'html',
+      'css',
+      'json',
+      'toml',
+      'yaml',
+      'dockerfile',
+      'htmldjango',
+    },
     auto_install = false,
     highlight = { enable = true },
     indent = { enable = true },
@@ -357,12 +386,54 @@ end
 
 require('mason').setup()
 require('mason-lspconfig').setup()
-local servers = { lua_ls = { Lua = { workspace = { checkThirdParty = false }, telemetry = { enable = false } } } }
+local lspconfig = require 'lspconfig'
+local servers = {
+  pyright = {
+    python = {
+      analysis = {
+        autoSearchPaths = true,
+        diagnosticMode = 'openFilesOnly',
+        useLibraryCodeForTypes = true,
+      },
+    },
+  },
+  lua_ls = {
+    Lua = {
+      workspace = { checkThirdParty = false },
+      telemetry = { enable = false },
+    },
+  },
+}
 local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities())
 local mason_lspconfig = require 'mason-lspconfig'
 mason_lspconfig.setup { ensure_installed = vim.tbl_keys(servers) }
 mason_lspconfig.setup_handlers { function(server_name) require('lspconfig')[server_name].setup { capabilities = capabilities, on_attach = on_attach, settings = servers[server_name], filetypes = (servers[server_name] or {}).filetypes, } end }
 
+-- Ruff installation via Mason can fail on some Python setups.
+-- If a system ruff binary exists, attach Ruff LSP directly.
+local ruff_server = nil
+if lspconfig.ruff then
+  ruff_server = 'ruff'
+elseif lspconfig.ruff_lsp then
+  ruff_server = 'ruff_lsp'
+end
+
+if vim.fn.executable 'ruff' == 1 and ruff_server then
+  lspconfig[ruff_server].setup {
+    capabilities = capabilities,
+    on_attach = on_attach,
+  }
+end
+
+vim.api.nvim_create_autocmd('LspAttach', {
+  callback = function(args)
+    local client = vim.lsp.get_client_by_id(args.data.client_id)
+    if client and (client.name == 'ruff' or client.name == 'ruff_lsp') then
+      client.server_capabilities.hoverProvider = false
+    end
+  end,
+})
+
 -- CMP setup
 local cmp = require 'cmp'
 local luasnip = require 'luasnip'
@@ -408,13 +479,10 @@ cmp.setup {
     { name = 'nvim_lsp' },
     { name = 'luasnip' },
   },
-}
-
-require("cmp").setup({
   formatting = {
-    format = require("tailwindcss-colorizer-cmp").formatter
-  }
-})
+    format = require('tailwindcss-colorizer-cmp').formatter,
+  },
+}
 
 require("colorizer").setup {
   user_default_options = {

lua/custom/plugins/init.lua

@@ -4,13 +4,6 @@
 -- See the kickstart.nvim README for more information
 
 return {
-  {
-    'neovim/nvim-lspconfig',
-    config = function()
-      require('custom.plugins.lspconfig') -- This simply loads the lspconfig.lua file
-    end,
-  },
-
   -- nvim-autopairs configuration
   {
     "windwp/nvim-autopairs",

lua/kickstart/plugins/autoformat.lua

@@ -4,90 +4,47 @@
 -- Adds additional commands as well to manage the behavior
 
 return {
-  'neovim/nvim-lspconfig',
-  'jose-elias-alvarez/null-ls.nvim',
+  'stevearc/conform.nvim',
+  event = { 'BufReadPre', 'BufNewFile' },
+  cmd = { 'ConformInfo' },
   config = function()
     -- Force .html files to be recognized as htmldjango for Jinja compatibility
-    vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, {
-      pattern = "*.html",
+    vim.api.nvim_create_autocmd({ 'BufRead', 'BufNewFile' }, {
+      pattern = '*.html',
       callback = function()
-        vim.bo.filetype = "htmldjango"
+        vim.bo.filetype = 'htmldjango'
       end,
     })
 
-    -- Switch for controlling whether you want autoformatting.
     -- Use :KickstartFormatToggle to toggle autoformatting on or off
     local format_is_enabled = true
     vim.api.nvim_create_user_command('KickstartFormatToggle', function()
       format_is_enabled = not format_is_enabled
       print('Setting autoformatting to: ' .. tostring(format_is_enabled))
     end, {})
 
-    -- Create an augroup that is used for managing our formatting autocmds.
-    -- We need one augroup per client to make sure that multiple clients
-    -- can attach to the same buffer without interfering with each other.
-    local _augroups = {}
-    local get_augroup = function(client)
-      if not _augroups[client.id] then
-        local group_name = 'kickstart-lsp-format-' .. client.name
-        local id = vim.api.nvim_create_augroup(group_name, { clear = true })
-        _augroups[client.id] = id
-      end
-
-      return _augroups[client.id]
-    end
-
-    -- Whenever an LSP attaches to a buffer, we will run this function.
-    --
-    -- See `:help LspAttach` for more information about this autocmd event.
-    vim.api.nvim_create_autocmd('LspAttach', {
-      group = vim.api.nvim_create_augroup('kickstart-lsp-attach-format', { clear = true }),
-      -- This is where we attach the autoformatting for reasonable clients
-      callback = function(args)
-        local client_id = args.data.client_id
-        local client = vim.lsp.get_client_by_id(client_id)
-        local bufnr = args.buf
-
-        -- Only attach to clients that support document formatting
-        if not client.server_capabilities.documentFormattingProvider then
-          return
-        end
-
-        -- Tsserver usually works poorly. Sorry you work with bad languages
-        -- You can remove this line if you know what you're doing :)
-        if client.name == 'tsserver' then
-          return
+    require('conform').setup {
+      formatters_by_ft = {
+        python = { 'ruff_organize_imports', 'ruff_format' },
+        htmldjango = { 'djlint' },
+        html = { 'prettier' },
+        css = { 'prettier' },
+        javascript = { 'prettier' },
+        json = { 'prettier' },
+        yaml = { 'prettier' },
+      },
+      format_on_save = function(bufnr)
+        if not format_is_enabled then
+          return nil
         end
 
-        -- Create an autocmd that will run *before* we save the buffer.
-        -- Run the formatting command for the LSP that has just attached.
-        vim.api.nvim_create_autocmd('BufWritePre', {
-          group = get_augroup(client),
-          buffer = bufnr,
-          callback = function()
-            if not format_is_enabled then
-              return
-            end
-
-            vim.lsp.buf.format {
-              async = false,
-              filter = function(c)
-                return c.id == client.id
-              end,
-            }
-          end,
-        })
+        return {
+          timeout_ms = 1000,
+          lsp_format = 'fallback',
+          bufnr = bufnr,
+        }
       end,
-    })
-
-    -- Set up null-ls for additional formatting needs
-    null_ls.setup({
-      sources = {
-        null_ls.builtins.formatting.prettier.with({
-          filetypes = { "html", "jinja", "htmldjango" },
-        }),
-      },
-    })
+    }
   end,
 }
 

lua/kickstart/plugins/debug.lua

@@ -20,6 +20,7 @@ return {
 
     -- Add your own debuggers here
     'leoluz/nvim-dap-go',
+    'mfussenegger/nvim-dap-python',
   },
   config = function()
     local dap = require 'dap'
@@ -39,6 +40,7 @@ return {
       ensure_installed = {
         -- Update this to ensure that you have the debuggers for the langs you want
         'delve',
+        'debugpy',
       },
     }
 
@@ -83,5 +85,6 @@ return {
 
     -- Install golang specific config
     require('dap-go').setup()
+    require('dap-python').setup(vim.fn.exepath 'python3')
   end,
 }