Compare commits

..

No commits in common. "bf5a280f343d1da5460a81ffa67e71a740d3faac" and "30e7dc07e57cd0191b939c22a967a212caf7e507" have entirely different histories.

2 changed files with 9 additions and 30 deletions

View File

@ -54,16 +54,16 @@ in
yamlfmt yamlfmt
]; ];
plugins = with pkgs.vimPlugins; [ plugins = with pkgs.vimPlugins; [
nvim-autopairs
nvim-lastplace
catppuccin-nvim catppuccin-nvim
cmp-nvim-lsp cmp-nvim-lsp
cmp-spell
cmp_luasnip cmp_luasnip
comment-nvim comment-nvim
copilot-cmp copilot-cmp
copilot-lua copilot-lua
dashboard-nvim dashboard-nvim
formatter-nvim formatter-nvim
gitsigns-nvim
lsp_lines-nvim lsp_lines-nvim
lspkind-nvim lspkind-nvim
lualine-lsp-progress lualine-lsp-progress
@ -72,12 +72,9 @@ in
neogit neogit
noice-nvim noice-nvim
nui-nvim # for noice-nvim nui-nvim # for noice-nvim
nvim-autopairs
nvim-cmp nvim-cmp
nvim-lastplace
nvim-lspconfig nvim-lspconfig
nvim-surround nvim-surround
nvim-tree-lua
nvim-treesitter-textsubjects nvim-treesitter-textsubjects
nvim-treesitter.withAllGrammars nvim-treesitter.withAllGrammars
nvim-ts-context-commentstring nvim-ts-context-commentstring
@ -86,6 +83,7 @@ in
plenary-nvim # for telescope, neogit plenary-nvim # for telescope, neogit
telescope-nvim telescope-nvim
which-key-nvim which-key-nvim
gitsigns-nvim
]; ];
}; };
}; };

View File

@ -93,6 +93,11 @@ require("nvim-treesitter.configs").setup({
}) })
local lspkind = require("lspkind") local lspkind = require("lspkind")
lspkind.init({
symbol_map = {
Copilot = "",
},
})
local cmp = require("cmp") local cmp = require("cmp")
local luasnip = require("luasnip") local luasnip = require("luasnip")
@ -102,9 +107,6 @@ cmp.setup({
mode = "symbol", -- show only symbol annotations mode = "symbol", -- show only symbol annotations
maxwidth = 50, -- prevent the popup from showing more than provided characters (e.g 50 will not show more than 50 characters) maxwidth = 50, -- prevent the popup from showing more than provided characters (e.g 50 will not show more than 50 characters)
ellipsis_char = "...", -- when popup menu exceed maxwidth, the truncated part would show ellipsis_char instead (must define maxwidth first) ellipsis_char = "...", -- when popup menu exceed maxwidth, the truncated part would show ellipsis_char instead (must define maxwidth first)
symbol_map = {
Copilot = "",
},
}), }),
}, },
snippet = { snippet = {
@ -144,16 +146,6 @@ cmp.setup({
{ name = "luasnip", priority = 7 }, { name = "luasnip", priority = 7 },
{ name = "nvim_lsp", priority = 9 }, { name = "nvim_lsp", priority = 9 },
{ name = "orgmode", priority = 9 }, { name = "orgmode", priority = 9 },
{
name = "spell",
option = {
keep_all_entries = false,
enable_in_context = function()
return true
end,
},
priority = 1,
},
}, },
}) })
@ -445,15 +437,4 @@ require("nvim-lastplace").setup({
lastplace_open_folds = true, lastplace_open_folds = true,
}) })
require("nvim-autopairs").setup() require("nvim-autopairs").setup({})
-- disable netrw at the very start of your init.lua (strongly advised)
vim.g.loaded_netrw = 1
vim.g.loaded_netrwPlugin = 1
-- set termguicolors to enable highlight groups
vim.opt.termguicolors = true
-- empty setup using defaults
require("nvim-tree").setup()
wk.register({
t = { "<cmd>NvimTreeFindFileToggle<cr>", "nvim tree" },
}, { prefix = "<leader>t", silent = true })