Skip to content

Commit 32b5924

Browse files
committed
Rebase current config with upstream
1 parent 739c289 commit 32b5924

File tree

1 file changed

+25
-8
lines changed

1 file changed

+25
-8
lines changed

init.lua

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ vim.g.have_nerd_font = true
107107
vim.opt.number = true
108108
-- You can also add relative line numbers, to help with jumping.
109109
-- Experiment for yourself to see if you like it!
110-
-- vim.opt.relativenumber = false
110+
vim.opt.relativenumber = false
111111

112112
-- Enable mouse mode, can be useful for resizing splits for example!
113113
vim.opt.mouse = 'a'
@@ -284,7 +284,7 @@ require('lazy').setup({
284284
-- set icon mappings to true if you have a Nerd Font
285285
mappings = vim.g.have_nerd_font,
286286
-- If you are using a Nerd Font: set icons.keys to an empty table which will use the
287-
-- default whick-key.nvim defined Nerd Font icons, otherwise define a string table
287+
-- default which-key.nvim defined Nerd Font icons, otherwise define a string table
288288
keys = vim.g.have_nerd_font and {} or {
289289
Up = '<Up> ',
290290
Down = '<Down> ',
@@ -594,6 +594,16 @@ require('lazy').setup({
594594
end,
595595
})
596596

597+
-- Change diagnostic symbols in the sign column (gutter)
598+
-- if vim.g.have_nerd_font then
599+
-- local signs = { ERROR = '', WARN = '', INFO = '', HINT = '' }
600+
-- local diagnostic_signs = {}
601+
-- for type, icon in pairs(signs) do
602+
-- diagnostic_signs[vim.diagnostic.severity[type]] = icon
603+
-- end
604+
-- vim.diagnostic.config { signs = { text = diagnostic_signs } }
605+
-- end
606+
597607
-- LSP servers and clients are able to communicate to each other what features they support.
598608
-- By default, Neovim doesn't support everything that is in the LSP specification.
599609
-- When you add nvim-cmp, luasnip, etc. Neovim now has *more* capabilities.
@@ -611,7 +621,6 @@ require('lazy').setup({
611621
-- - settings (table): Override the default settings passed when initializing the server.
612622
-- For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/
613623
local servers = {
614-
-- clangd = {},
615624
gopls = {},
616625
rust_analyzer = {},
617626
pylsp = {
@@ -626,6 +635,10 @@ require('lazy').setup({
626635
},
627636
},
628637
bashls = {},
638+
-- clangd = {},
639+
-- gopls = {},
640+
-- pyright = {},
641+
-- rust_analyzer = {},
629642
-- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs
630643
--
631644
-- Some languages (like typescript) have entire language plugins that can be useful:
@@ -664,8 +677,8 @@ require('lazy').setup({
664677
local ensure_installed = vim.tbl_keys(servers or {})
665678
vim.list_extend(ensure_installed, {
666679
'stylua', -- Used to format Lua code
667-
'autopep8', -- Used to format Python code
668-
'flake8', -- Used to format Python code
680+
'autopep8', -- Used to format Python code
681+
'flake8', -- Used to format Python code
669682
})
670683
require('mason-tool-installer').setup { ensure_installed = ensure_installed }
671684

@@ -907,7 +920,7 @@ require('lazy').setup({
907920
main = 'nvim-treesitter.configs', -- Sets main module to use for opts
908921
-- [[ Configure Treesitter ]] See `:help nvim-treesitter`
909922
opts = {
910-
ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc', 'go' },
923+
ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc', 'go', 'rust' },
911924
-- Autoinstall languages that are not installed
912925
auto_install = true,
913926
highlight = {
@@ -927,7 +940,7 @@ require('lazy').setup({
927940
-- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects
928941
},
929942

930-
-- The following two comments only work if you have downloaded the kickstart repo, not just copy pasted the
943+
-- The following comments only work if you have downloaded the kickstart repo, not just copy pasted the
931944
-- init.lua. If you want these files, they are in the repository, so you can just download them and
932945
-- place them in the correct locations.
933946

@@ -947,8 +960,12 @@ require('lazy').setup({
947960
-- This is the easiest way to modularize your config.
948961
--
949962
-- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
950-
-- For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins`
951963
-- { import = 'custom.plugins' },
964+
--
965+
-- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec`
966+
-- Or use telescope!
967+
-- In normal mode type `<space>sh` then write `lazy.nvim-plugin`
968+
-- you can continue same window with `<space>sr` which resumes last telescope search
952969
}, {
953970
ui = {
954971
-- If you are using a Nerd Font: set icons to an empty table which will use the

0 commit comments

Comments
 (0)