Skip to content

Commit b3946a8

Browse files
authored
Merge branch 'master' into master
2 parents b5b83a9 + 2ba39c6 commit b3946a8

File tree

3 files changed

+32
-2
lines changed

3 files changed

+32
-2
lines changed

init.lua

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,6 +590,15 @@ require('lazy').setup({
590590
end,
591591
})
592592

593+
-- Change diagnostic symbols in the sign column (gutter)
594+
-- if vim.g.have_nerd_font then
595+
-- local signs = { Error = '', Warn = '', Hint = '', Info = '' }
596+
-- for type, icon in pairs(signs) do
597+
-- local hl = 'DiagnosticSign' .. type
598+
-- vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl })
599+
-- end
600+
-- end
601+
593602
-- LSP servers and clients are able to communicate to each other what features they support.
594603
-- By default, Neovim doesn't support everything that is in the LSP specification.
595604
-- When you add nvim-cmp, luasnip, etc. Neovim now has *more* capabilities.
@@ -911,7 +920,7 @@ require('lazy').setup({
911920
-- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects
912921
},
913922

914-
-- The following two comments only work if you have downloaded the kickstart repo, not just copy pasted the
923+
-- The following comments only work if you have downloaded the kickstart repo, not just copy pasted the
915924
-- init.lua. If you want these files, they are in the repository, so you can just download them and
916925
-- place them in the correct locations.
917926

@@ -933,6 +942,10 @@ require('lazy').setup({
933942
-- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
934943
-- For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins`
935944
{ import = 'custom.plugins' },
945+
-- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec`
946+
-- Or use telescope!
947+
-- In normal mode type `<space>sh` then write `lazy.nvim-plugin`
948+
-- you can continue same window with `<space>sr` which resumes last telescope search
936949
}, {
937950
ui = {
938951
-- If you are using a Nerd Font: set icons to an empty table which will use the

lua/kickstart/plugins/debug.lua

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,18 @@ return {
8989
},
9090
}
9191

92+
-- Change breakpoint icons
93+
-- vim.api.nvim_set_hl(0, 'DapBreak', { fg = '#e51400' })
94+
-- vim.api.nvim_set_hl(0, 'DapStop', { fg = '#ffcc00' })
95+
-- local breakpoint_icons = vim.g.have_nerd_font
96+
-- and { Breakpoint = '', BreakpointCondition = '', BreakpointRejected = '', LogPoint = '', Stopped = '' }
97+
-- or { Breakpoint = '●', BreakpointCondition = '⊜', BreakpointRejected = '⊘', LogPoint = '◆', Stopped = '⭔' }
98+
-- for type, icon in pairs(breakpoint_icons) do
99+
-- local tp = 'Dap' .. type
100+
-- local hl = (type == 'Stopped') and 'DapStop' or 'DapBreak'
101+
-- vim.fn.sign_define(tp, { text = icon, texthl = hl, numhl = hl })
102+
-- end
103+
92104
dap.listeners.after.event_initialized['dapui_config'] = dapui.open
93105
dap.listeners.before.event_terminated['dapui_config'] = dapui.close
94106
dap.listeners.before.event_exited['dapui_config'] = dapui.close

lua/kickstart/plugins/lint.lua

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,12 @@ return {
4747
vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWritePost', 'InsertLeave' }, {
4848
group = lint_augroup,
4949
callback = function()
50-
lint.try_lint()
50+
-- Only run the linter in buffers that you can modify in order to
51+
-- avoid superfluous noise, notably within the handy LSP pop-ups that
52+
-- describe the hovered symbol using Markdown.
53+
if vim.opt_local.modifiable:get() then
54+
lint.try_lint()
55+
end
5156
end,
5257
})
5358
end,

0 commit comments

Comments
 (0)