diff --git a/init.lua b/init.lua
index 542c6f6a..d1b77d4b 100644
--- a/init.lua
+++ b/init.lua
@@ -4,7 +4,7 @@
vim.g.mapleader = ' '
vim.g.maplocalleader = ' '
--- Set to true if you have a Nerd Font installed
+-- Set to true if you have a Nerd Font installed and selected in the terminal
vim.g.have_nerd_font = true
-- [[ Setting options ]]
@@ -188,11 +188,59 @@ require('lazy').setup({
{ -- Useful plugin to show you pending keybinds.
'folke/which-key.nvim',
event = 'VimEnter', -- Sets the loading event to 'VimEnter'
+ opts = {
+ icons = {
+ -- set icon mappings to true if you have a Nerd Font
+ mappings = vim.g.have_nerd_font,
+ -- If you are using a Nerd Font: set icons.keys to an empty table which will use the
+ -- default which-key.nvim defined Nerd Font icons, otherwise define a string table
+ keys = vim.g.have_nerd_font and {} or {
+ Up = '<Up> ',
+ Down = '<Down> ',
+ Left = '<Left> ',
+ Right = '<Right> ',
+ C = '<C-…> ',
+ M = '<M-…> ',
+ D = '<D-…> ',
+ S = '<S-…> ',
+ CR = '<CR> ',
+ Esc = '<Esc> ',
+ ScrollWheelDown = '<ScrollWheelDown> ',
+ ScrollWheelUp = '<ScrollWheelUp> ',
+ NL = '<NL> ',
+ BS = '<BS> ',
+ Space = '<Space> ',
+ Tab = '<Tab> ',
+ F1 = '<F1>',
+ F2 = '<F2>',
+ F3 = '<F3>',
+ F4 = '<F4>',
+ F5 = '<F5>',
+ F6 = '<F6>',
+ F7 = '<F7>',
+ F8 = '<F8>',
+ F9 = '<F9>',
+ F10 = '<F10>',
+ F11 = '<F11>',
+ F12 = '<F12>',
+ },
+ },
+
+ -- Document existing key chains
+ spec = {
+ { '<leader>c', group = '[C]ode', mode = { 'n', 'x' } },
+ { '<leader>d', group = '[D]ocument' },
+ { '<leader>r', group = '[R]ename' },
+ { '<leader>s', group = '[S]earch' },
+ { '<leader>w', group = '[W]orkspace' },
+ { '<leader>t', group = '[T]oggle' },
+ { '<leader>h', group = 'Git [H]unk', mode = { 'n', 'v' } },
+ },
+ },
config = function() -- This is the function that runs, AFTER loading
require('which-key').setup()
end,
},
-
-- NOTE: Plugins can specify dependencies.
--
-- The dependencies are proper plugin specifications as well - anything
@@ -456,6 +504,16 @@ require('lazy').setup({
end,
})
+ -- Change diagnostic symbols in the sign column (gutter)
+ -- if vim.g.have_nerd_font then
+ -- local signs = { ERROR = '', WARN = '', INFO = '', HINT = '' }
+ -- local diagnostic_signs = {}
+ -- for type, icon in pairs(signs) do
+ -- diagnostic_signs[vim.diagnostic.severity[type]] = icon
+ -- end
+ -- vim.diagnostic.config { signs = { text = diagnostic_signs } }
+ -- end
+
-- LSP servers and clients are able to communicate to each other what features they support.
-- By default, Neovim doesn't support everything that is in the LSP specification.
-- When you add nvim-cmp, luasnip, etc. Neovim now has *more* capabilities.
@@ -473,7 +531,7 @@ require('lazy').setup({
-- - settings (table): Override the default settings passed when initializing the server.
-- For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/
local servers = {
- -- clangd = {},
+ clangd = {},
gopls = {},
-- pyright = {},
ruff = {},
@@ -783,7 +841,7 @@ require('lazy').setup({
-- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects
},
- -- The following two comments only work if you have downloaded the kickstart repo, not just copy pasted the
+ -- The following comments only work if you have downloaded the kickstart repo, not just copy pasted the
-- init.lua. If you want these files, they are in the repository, so you can just download them and
-- place them in the correct locations.
@@ -803,8 +861,12 @@ require('lazy').setup({
-- This is the easiest way to modularize your config.
--
-- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
- -- For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins`
{ import = 'custom.plugins' },
+ --
+ -- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec`
+ -- Or use telescope!
+ -- In normal mode type `<space>sh` then write `lazy.nvim-plugin`
+ -- you can continue same window with `<space>sr` which resumes last telescope search
}, {
ui = {
-- If you are using a Nerd Font: set icons to an empty table which will use the
diff --git a/lua/kickstart/plugins/debug.lua b/lua/kickstart/plugins/debug.lua
index 196f2c6d..753cb0ce 100644
--- a/lua/kickstart/plugins/debug.lua
+++ b/lua/kickstart/plugins/debug.lua
@@ -24,28 +24,59 @@ return {
-- Add your own debuggers here
'leoluz/nvim-dap-go',
},
- keys = function(_, keys)
- local dap = require 'dap'
- local dapui = require 'dapui'
- return {
- -- Basic debugging keymaps, feel free to change to your liking!
- { '<F5>', dap.continue, desc = 'Debug: Start/Continue' },
- { '<F1>', dap.step_into, desc = 'Debug: Step Into' },
- { '<F2>', dap.step_over, desc = 'Debug: Step Over' },
- { '<F3>', dap.step_out, desc = 'Debug: Step Out' },
- { '<leader>b', dap.toggle_breakpoint, desc = 'Debug: Toggle Breakpoint' },
- {
- '<leader>B',
- function()
- dap.set_breakpoint(vim.fn.input 'Breakpoint condition: ')
- end,
- desc = 'Debug: Set Breakpoint',
- },
- -- Toggle to see last session result. Without this, you can't see session output in case of unhandled exception.
- { '<F7>', dapui.toggle, desc = 'Debug: See last session result.' },
- unpack(keys),
- }
- end,
+ keys = {
+ -- Basic debugging keymaps, feel free to change to your liking!
+ {
+ '<F5>',
+ function()
+ require('dap').continue()
+ end,
+ desc = 'Debug: Start/Continue',
+ },
+ {
+ '<F1>',
+ function()
+ require('dap').step_into()
+ end,
+ desc = 'Debug: Step Into',
+ },
+ {
+ '<F2>',
+ function()
+ require('dap').step_over()
+ end,
+ desc = 'Debug: Step Over',
+ },
+ {
+ '<F3>',
+ function()
+ require('dap').step_out()
+ end,
+ desc = 'Debug: Step Out',
+ },
+ {
+ '<leader>b',
+ function()
+ require('dap').toggle_breakpoint()
+ end,
+ desc = 'Debug: Toggle Breakpoint',
+ },
+ {
+ '<leader>B',
+ function()
+ require('dap').set_breakpoint(vim.fn.input 'Breakpoint condition: ')
+ end,
+ desc = 'Debug: Set Breakpoint',
+ },
+ -- Toggle to see last session result. Without this, you can't see session output in case of unhandled exception.
+ {
+ '<F7>',
+ function()
+ require('dapui').toggle()
+ end,
+ desc = 'Debug: See last session result.',
+ },
+ },
config = function()
local dap = require 'dap'
local dapui = require 'dapui'
@@ -89,6 +120,18 @@ return {
},
}
+ -- Change breakpoint icons
+ -- vim.api.nvim_set_hl(0, 'DapBreak', { fg = '#e51400' })
+ -- vim.api.nvim_set_hl(0, 'DapStop', { fg = '#ffcc00' })
+ -- local breakpoint_icons = vim.g.have_nerd_font
+ -- and { Breakpoint = '', BreakpointCondition = '', BreakpointRejected = '', LogPoint = '', Stopped = '' }
+ -- or { Breakpoint = '●', BreakpointCondition = '⊜', BreakpointRejected = '⊘', LogPoint = '◆', Stopped = '⭔' }
+ -- for type, icon in pairs(breakpoint_icons) do
+ -- local tp = 'Dap' .. type
+ -- local hl = (type == 'Stopped') and 'DapStop' or 'DapBreak'
+ -- vim.fn.sign_define(tp, { text = icon, texthl = hl, numhl = hl })
+ -- end
+
dap.listeners.after.event_initialized['dapui_config'] = dapui.open
dap.listeners.before.event_terminated['dapui_config'] = dapui.close
dap.listeners.before.event_exited['dapui_config'] = dapui.close
diff --git a/lua/kickstart/plugins/lint.lua b/lua/kickstart/plugins/lint.lua
index ca9bc237..907c6bf3 100644
--- a/lua/kickstart/plugins/lint.lua
+++ b/lua/kickstart/plugins/lint.lua
@@ -47,7 +47,12 @@ return {
vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWritePost', 'InsertLeave' }, {
group = lint_augroup,
callback = function()
- lint.try_lint()
+ -- Only run the linter in buffers that you can modify in order to
+ -- avoid superfluous noise, notably within the handy LSP pop-ups that
+ -- describe the hovered symbol using Markdown.
+ if vim.opt_local.modifiable:get() then
+ lint.try_lint()
+ end
end,
})
end,