mirror
/
kickstart.nvim
mirror of https://github.com/nvim-lua/kickstart.nvim.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

just formatting

This commit is contained in:
dlond 2025-05-20 20:42:31 +12:00
parent 8cff14c262
commit 32471236f8
3 changed files with 166 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
init.lua
View File

@ -301,7 +301,7 @@ require('lazy').setup({
-- Then, because we use the `opts` key (recommended), the configuration runs -- Then, because we use the `opts` key (recommended), the configuration runs
-- after the plugin has been loaded as `require(MODULE).setup(opts)`. -- after the plugin has been loaded as `require(MODULE).setup(opts)`.
{ -- Useful plugin to show you pending keybinds. { -- Useful plugin to show you pending keybinds.
'folke/which-key.nvim', 'folke/which-key.nvim',
event = 'VimEnter', -- Sets the loading event to 'VimEnter' event = 'VimEnter', -- Sets the loading event to 'VimEnter'
opts = { opts = {
@ -382,7 +382,7 @@ require('lazy').setup({
{ 'nvim-telescope/telescope-ui-select.nvim' }, { 'nvim-telescope/telescope-ui-select.nvim' },
-- Useful for getting pretty icons, but requires a Nerd Font. -- Useful for getting pretty icons, but requires a Nerd Font.
{ 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font }, { 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font },
}, },
config = function() config = function()
-- Telescope is a fuzzy finder that comes with a lot of different things that -- Telescope is a fuzzy finder that comes with a lot of different things that

70
lua/custom/plugins/formatting.lua
View File

@ -1,40 +1,40 @@
-- Formatter configuration -- Formatter configuration
return { return {
-- ======================================== -- ========================================
-- Formatter Configuration (conform.nvim) -- Formatter Configuration (conform.nvim)
-- ======================================== -- ========================================
{ {
'stevearc/conform.nvim', 'stevearc/conform.nvim',
event = 'BufWritePre', -- Format on save event = 'BufWritePre', -- Format on save
-- cmd = { 'ConformInfo' }, -- Optional: If you want the command available -- cmd = { 'ConformInfo' }, -- Optional: If you want the command available
-- keys = { ... } -- Optional: Define keys if needed -- keys = { ... } -- Optional: Define keys if needed
opts = { opts = {
formatters_by_ft = { formatters_by_ft = {
lua = { 'stylua' }, lua = { 'stylua' },
c = { 'clang_format' }, c = { 'clang_format' },
cpp = { 'clang_format' }, cpp = { 'clang_format' },
-- Use ruff for Python formatting (includes isort and is faster than black -- Use ruff for Python formatting (includes isort and is faster than black
-- Ensure 'ruff' is installed via Home Manager (pkgs.ruff) -- Ensure 'ruff' is installed via Home Manager (pkgs.ruff)
python = { 'ruff_format', 'ruff_fix' }, python = { 'ruff_format', 'ruff_fix' },
-- python = { 'isort', 'black' }, -- python = { 'isort', 'black' },
nix = { 'alejandra' }, -- Add nix formatter nix = { 'alejandra' }, -- Add nix formatter
-- Add other filetypes and formatters, e.g.: -- Add other filetypes and formatters, e.g.:
-- javascript = { "prettier" }, -- javascript = { "prettier" },
-- typescript = { "prettier" }, -- typescript = { "prettier" },
-- css = { "prettier" }, -- css = { "prettier" },
-- html = { "prettier" }, -- html = { "prettier" },
-- json = { "prettier" }, -- json = { "prettier" },
-- yaml = { "prettier" }, -- yaml = { "prettier" },
-- markdown = { "prettier" }, -- markdown = { "prettier" },
-- bash = { "shfmt" }, -- bash = { "shfmt" },
}, },
-- Configure format_on_save behavior -- Configure format_on_save behavior
format_on_save = { format_on_save = {
-- I recommend these options, but adjust to your liking -- I recommend these options, but adjust to your liking
timeout_ms = 500, -- Stop formatting if it takes too long timeout_ms = 500, -- Stop formatting if it takes too long
lsp_fallback = true, -- Fallback to LSP formatting if conform fails lsp_fallback = true, -- Fallback to LSP formatting if conform fails
}, },
},
}, },
},
} }

253
lua/custom/plugins/lsp.lua
View File

@ -2,137 +2,142 @@
-- LSP configuration, assuming LSP servers are installed via Nix/Home Manager -- LSP configuration, assuming LSP servers are installed via Nix/Home Manager
return { return {
-- ======================================== -- ========================================
-- LSP Configuration (LSP servers provided by Nix/Home Manager) -- LSP Configuration (LSP servers provided by Nix/Home Manager)
-- ======================================== -- ========================================
{ {
'neovim/nvim-lspconfig', 'neovim/nvim-lspconfig',
event = { "BufReadPre", "BufNewFile" }, -- Load LSP config early event = { 'BufReadPre', 'BufNewFile' }, -- Load LSP config early
dependencies = { dependencies = {
-- Dependencies for nvim-lspconfig itself, if any. -- Dependencies for nvim-lspconfig itself, if any.
-- Mason and mason-lspconfig are removed as Nix handles LSP installation. -- Mason and mason-lspconfig are removed as Nix handles LSP installation.
{ 'j-hui/fidget.nvim', opts = {} }, -- Useful status updates for LSP { 'j-hui/fidget.nvim', opts = {} }, -- Useful status updates for LSP
'hrsh7th/cmp-nvim-lsp', -- LSP completion source for nvim-cmp 'hrsh7th/cmp-nvim-lsp', -- LSP completion source for nvim-cmp
}, },
config = function(_, opts) config = function(_, opts)
-- This config function runs AFTER the plugin and its dependencies are loaded. -- This config function runs AFTER the plugin and its dependencies are loaded.
-- It sets up the LSP servers. -- It sets up the LSP servers.
-- Get LSP capabilities, augmented by nvim-cmp -- Get LSP capabilities, augmented by nvim-cmp
local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities()) local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities())
-- Define the list of LSP servers you want to configure. -- Define the list of LSP servers you want to configure.
-- These servers must be installed via Nix/Home Manager and be in your PATH. -- These servers must be installed via Nix/Home Manager and be in your PATH.
local servers_to_setup = { local servers_to_setup = {
"lua_ls", 'lua_ls',
"clangd", 'clangd',
"pyright", 'pyright',
"nixd", 'nixd',
"ruff", 'ruff',
-- Add other servers like "bashls", "yamlls", "gopls", "rust_analyzer" etc. -- Add other servers like "bashls", "yamlls", "gopls", "rust_analyzer" etc.
-- Ensure the corresponding packages (e.g., pkgs.bash-language-server) -- Ensure the corresponding packages (e.g., pkgs.bash-language-server)
-- are in your Home Manager home.packages list. -- are in your Home Manager home.packages list.
} }
-- Iterate through the defined servers list and set them up with lspconfig -- Iterate through the defined servers list and set them up with lspconfig
for _, server_name in ipairs(servers_to_setup) do for _, server_name in ipairs(servers_to_setup) do
-- print('Attempting to set up LSP server: ' .. server_name) -- Debug print -- print('Attempting to set up LSP server: ' .. server_name) -- Debug print
require('lspconfig')[server_name].setup { require('lspconfig')[server_name].setup {
capabilities = capabilities, -- Pass augmented capabilities capabilities = capabilities, -- Pass augmented capabilities
-- Add any server-specific overrides here if needed, e.g.: -- Add any server-specific overrides here if needed, e.g.:
-- For lua_ls: -- For lua_ls:
-- settings = { Lua = { diagnostics = { globals = {'vim'} } } }, -- settings = { Lua = { diagnostics = { globals = {'vim'} } } },
} }
end
-- Setup keymaps and diagnostics based on kickstart's original init.lua LSP section
vim.api.nvim_create_autocmd('LspAttach', {
group = vim.api.nvim_create_augroup('kickstart-lsp-attach-override', { clear = true }),
callback = function(event)
local map = function(keys, func, desc, mode)
mode = mode or 'n'
vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc })
end
-- Standard LSP keymaps
map('grn', vim.lsp.buf.rename, '[R]e[n]ame')
map('gra', vim.lsp.buf.code_action, '[G]oto Code [A]ction', { 'n', 'x' })
map('grr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
map('gri', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation')
map('grd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition')
map('grD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
map('gO', require('telescope.builtin').lsp_document_symbols, 'Open Document Symbols')
map('gW', require('telescope.builtin').lsp_dynamic_workspace_symbols, 'Open Workspace Symbols')
map('grt', require('telescope.builtin').lsp_type_definitions, '[G]oto [T]ype Definition')
-- Highlight references
local client = vim.lsp.get_client_by_id(event.data.client_id)
local function client_supports_method(client, method, bufnr)
if vim.fn.has 'nvim-0.11' == 1 then
return client:supports_method(method, { bufnr = bufnr })
else
return client.supports_method(method, { bufnr = bufnr })
end end
end
-- Setup keymaps and diagnostics based on kickstart's original init.lua LSP section if client and client_supports_method(client, 'textDocument/documentHighlight', event.buf) then
vim.api.nvim_create_autocmd('LspAttach', { local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight-override', { clear = false })
group = vim.api.nvim_create_augroup('kickstart-lsp-attach-override', { clear = true }), vim.api.nvim_create_autocmd(
callback = function(event) { 'CursorHold', 'CursorHoldI' },
local map = function(keys, func, desc, mode) { buffer = event.buf, group = highlight_augroup, callback = vim.lsp.buf.document_highlight }
mode = mode or 'n' )
vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc }) vim.api.nvim_create_autocmd(
end { 'CursorMoved', 'CursorMovedI' },
{ buffer = event.buf, group = highlight_augroup, callback = vim.lsp.buf.clear_references }
-- Standard LSP keymaps )
map('grn', vim.lsp.buf.rename, '[R]e[n]ame') vim.api.nvim_create_autocmd('LspDetach', {
map('gra', vim.lsp.buf.code_action, '[G]oto Code [A]ction', { 'n', 'x' }) group = vim.api.nvim_create_augroup('kickstart-lsp-detach-override', { clear = true }),
map('grr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences') callback = function(event2)
map('gri', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation') vim.lsp.buf.clear_references()
map('grd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition') vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight-override', buffer = event2.buf }
map('grD', vim.lsp.buf.declaration, '[G]oto [D]eclaration') end,
map('gO', require('telescope.builtin').lsp_document_symbols, 'Open Document Symbols')
map('gW', require('telescope.builtin').lsp_dynamic_workspace_symbols, 'Open Workspace Symbols')
map('grt', require('telescope.builtin').lsp_type_definitions, '[G]oto [T]ype Definition')
-- Highlight references
local client = vim.lsp.get_client_by_id(event.data.client_id)
local function client_supports_method(client, method, bufnr)
if vim.fn.has 'nvim-0.11' == 1 then
return client:supports_method(method, { bufnr = bufnr })
else
return client.supports_method(method, { bufnr = bufnr })
end
end
if client and client_supports_method(client, 'textDocument/documentHighlight', event.buf) then
local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight-override',
{ clear = false })
vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' },
{ buffer = event.buf, group = highlight_augroup, callback = vim.lsp.buf.document_highlight })
vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' },
{ buffer = event.buf, group = highlight_augroup, callback = vim.lsp.buf.clear_references })
vim.api.nvim_create_autocmd('LspDetach',
{
group = vim.api.nvim_create_augroup('kickstart-lsp-detach-override', { clear = true }),
callback = function(
event2)
vim.lsp.buf.clear_references(); vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight-override', buffer = event2.buf }
end
})
end
-- Inlay hints toggle
if client and client_supports_method(client, 'textDocument/inlayHint', event.buf) then
map('<leader>th',
function() vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf }) end,
'[T]oggle Inlay [H]ints')
end
end,
}) })
end
-- Diagnostic configuration -- Inlay hints toggle
vim.diagnostic.config { if client and client_supports_method(client, 'textDocument/inlayHint', event.buf) then
severity_sort = true, map('<leader>th', function()
float = { border = 'rounded', source = 'if_many' }, vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf })
underline = { severity = vim.diagnostic.severity.ERROR }, end, '[T]oggle Inlay [H]ints')
signs = vim.g.have_nerd_font and { end
text = { end,
[vim.diagnostic.severity.ERROR] = '󰅚 ', [vim.diagnostic.severity.WARN] = '󰀪 ', [vim.diagnostic.severity.INFO] = '󰋽 ', [vim.diagnostic.severity.HINT] = '󰌶 ', })
},
} or {}, -- Diagnostic configuration
virtual_text = { vim.diagnostic.config {
source = 'if_many', spacing = 2, severity_sort = true,
format = function(diagnostic) float = { border = 'rounded', source = 'if_many' },
local diagnostic_message = { underline = { severity = vim.diagnostic.severity.ERROR },
[vim.diagnostic.severity.ERROR] = diagnostic.message, signs = vim.g.have_nerd_font and {
[vim.diagnostic.severity.WARN] = diagnostic.message, text = {
[vim.diagnostic.severity.INFO] = [vim.diagnostic.severity.ERROR] = '󰅚 ',
diagnostic.message, [vim.diagnostic.severity.WARN] = '󰀪 ',
[vim.diagnostic.severity.HINT] = diagnostic.message [vim.diagnostic.severity.INFO] = '󰋽 ',
} [vim.diagnostic.severity.HINT] = '󰌶 ',
return diagnostic_message[diagnostic.severity] },
end, } or {},
}, virtual_text = {
source = 'if_many',
spacing = 2,
format = function(diagnostic)
local diagnostic_message = {
[vim.diagnostic.severity.ERROR] = diagnostic.message,
[vim.diagnostic.severity.WARN] = diagnostic.message,
[vim.diagnostic.severity.INFO] = diagnostic.message,
[vim.diagnostic.severity.HINT] = diagnostic.message,
} }
end, -- End of config function return diagnostic_message[diagnostic.severity]
}, end,
-- lazydev setup (still useful for Neovim Lua development)
{
'folke/lazydev.nvim',
ft = 'lua',
opts = {
library = { { path = 'luvit-meta/library', words = { 'vim%.uv' } } },
}, },
}
end, -- End of config function
},
-- lazydev setup (still useful for Neovim Lua development)
{
'folke/lazydev.nvim',
ft = 'lua',
opts = {
library = { { path = 'luvit-meta/library', words = { 'vim%.uv' } } },
}, },
},
} }