diff --git a/modules/programs/nvim/default.nix b/modules/programs/nvim/default.nix index 7453ec7..554da79 100644 --- a/modules/programs/nvim/default.nix +++ b/modules/programs/nvim/default.nix @@ -54,16 +54,16 @@ in yamlfmt ]; plugins = with pkgs.vimPlugins; [ - nvim-autopairs - nvim-lastplace catppuccin-nvim cmp-nvim-lsp + cmp-spell cmp_luasnip comment-nvim copilot-cmp copilot-lua dashboard-nvim formatter-nvim + gitsigns-nvim lsp_lines-nvim lspkind-nvim lualine-lsp-progress @@ -72,9 +72,12 @@ in neogit noice-nvim nui-nvim # for noice-nvim + nvim-autopairs nvim-cmp + nvim-lastplace nvim-lspconfig nvim-surround + nvim-tree-lua nvim-treesitter-textsubjects nvim-treesitter.withAllGrammars nvim-ts-context-commentstring @@ -83,7 +86,6 @@ in plenary-nvim # for telescope, neogit telescope-nvim which-key-nvim - gitsigns-nvim ]; }; }; diff --git a/modules/programs/nvim/init.lua b/modules/programs/nvim/init.lua index 52aa4dc..b5c9a21 100644 --- a/modules/programs/nvim/init.lua +++ b/modules/programs/nvim/init.lua @@ -93,11 +93,6 @@ require("nvim-treesitter.configs").setup({ }) local lspkind = require("lspkind") -lspkind.init({ - symbol_map = { - Copilot = "", - }, -}) local cmp = require("cmp") local luasnip = require("luasnip") @@ -107,6 +102,9 @@ cmp.setup({ 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) ellipsis_char = "...", -- when popup menu exceed maxwidth, the truncated part would show ellipsis_char instead (must define maxwidth first) + symbol_map = { + Copilot = "", + }, }), }, snippet = { @@ -146,6 +144,16 @@ cmp.setup({ { name = "luasnip", priority = 7 }, { name = "nvim_lsp", priority = 9 }, { name = "orgmode", priority = 9 }, + { + name = "spell", + option = { + keep_all_entries = false, + enable_in_context = function() + return true + end, + }, + priority = 1, + }, }, }) @@ -437,4 +445,15 @@ require("nvim-lastplace").setup({ 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 = { "NvimTreeFindFileToggle", "nvim tree" }, +}, { prefix = "t", silent = true })