Skip to content

Commit 3de526d

Browse files
committed
Merge branch 'master' into codemedic-customisations
* master: Remove two because there are more than two. (nvim-lua#1213) Set breakpoint icons and their highlight colors (nvim-lua#1194) Change diagnostic symbols if vim.g.have_nerd_font is true (nvim-lua#1195) samarth-nagar fix: lazy help tag on line 931 (nvim-lua#1167) Disable linting autocmd for readonly buffers (nvim-lua#1202) fix: update lazy uninstall information link (nvim-lua#1148)
2 parents 6ebbb57 + 2ba39c6 commit 3de526d

File tree

4 files changed

+36
-4
lines changed

4 files changed

+36
-4
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ examples of adding popularly requested plugins.
130130
`~/.local/share/nvim-kickstart`. You can apply this approach to any Neovim
131131
distribution that you would like to try out.
132132
* What if I want to "uninstall" this configuration:
133-
* See [lazy.nvim uninstall](https://github.com/folke/lazy.nvim#-uninstalling) information
133+
* See [lazy.nvim uninstall](https://lazy.folke.io/usage#-uninstalling) information
134134
* Why is the kickstart `init.lua` a single file? Wouldn't it make sense to split it into multiple files?
135135
* The main purpose of kickstart is to serve as a teaching tool and a reference
136136
configuration that someone can easily use to `git clone` as a basis for their own.

init.lua

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ vim.g.mapleader = ' '
9191
vim.g.maplocalleader = ' '
9292

9393
-- Set to true if you have a Nerd Font installed and selected in the terminal
94+
vim.g.have_nerd_font = false
9495
vim.g.have_nerd_font = (vim.fn.has 'gui_running' ~= 1)
95-
vim.g.have_nerd_font = true
9696

9797
-- [[ Setting options ]]
9898
-- See `:help vim.opt`
@@ -604,6 +604,15 @@ require('lazy').setup({
604604
end,
605605
})
606606

607+
-- Change diagnostic symbols in the sign column (gutter)
608+
-- if vim.g.have_nerd_font then
609+
-- local signs = { Error = '', Warn = '', Hint = '', Info = '' }
610+
-- for type, icon in pairs(signs) do
611+
-- local hl = 'DiagnosticSign' .. type
612+
-- vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl })
613+
-- end
614+
-- end
615+
607616
-- LSP servers and clients are able to communicate to each other what features they support.
608617
-- By default, Neovim doesn't support everything that is in the LSP specification.
609618
-- When you add nvim-cmp, luasnip, etc. Neovim now has *more* capabilities.
@@ -961,7 +970,7 @@ require('lazy').setup({
961970
-- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects
962971
},
963972

964-
-- The following two comments only work if you have downloaded the kickstart repo, not just copy pasted the
973+
-- The following comments only work if you have downloaded the kickstart repo, not just copy pasted the
965974
-- init.lua. If you want these files, they are in the repository, so you can just download them and
966975
-- place them in the correct locations.
967976

@@ -981,6 +990,12 @@ require('lazy').setup({
981990
-- This is the easiest way to modularize your config.
982991
--
983992
-- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
993+
-- { import = 'custom.plugins' },
994+
--
995+
-- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec`
996+
-- Or use telescope!
997+
-- In normal mode type `<space>sh` then write `lazy.nvim-plugin`
998+
-- you can continue same window with `<space>sr` which resumes last telescope search
984999
-- For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins`
9851000
{ import = 'custom.plugins' },
9861001
}, {

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)