From d99a52fb0ee2e3c7514b143190937226702d710c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20B=C3=B6hme?= <mail@moritzboeh.me>
Date: Sun, 19 Feb 2023 13:21:37 +0100
Subject: [PATCH 1/3] nvim: add spell completion

---
 modules/programs/nvim/default.nix |  1 +
 modules/programs/nvim/init.lua    | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/modules/programs/nvim/default.nix b/modules/programs/nvim/default.nix
index 7453ec7..cd170f4 100644
--- a/modules/programs/nvim/default.nix
+++ b/modules/programs/nvim/default.nix
@@ -58,6 +58,7 @@ in
         nvim-lastplace
         catppuccin-nvim
         cmp-nvim-lsp
+        cmp-spell
         cmp_luasnip
         comment-nvim
         copilot-cmp
diff --git a/modules/programs/nvim/init.lua b/modules/programs/nvim/init.lua
index 52aa4dc..a2479b1 100644
--- a/modules/programs/nvim/init.lua
+++ b/modules/programs/nvim/init.lua
@@ -146,6 +146,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,
+    },
   },
 })
 

From 16a579b6b323ede6050a163479fad474ca702c68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20B=C3=B6hme?= <mail@moritzboeh.me>
Date: Sun, 19 Feb 2023 13:23:49 +0100
Subject: [PATCH 2/3] nvim: add nvim tree

---
 modules/programs/nvim/default.nix |  1 +
 modules/programs/nvim/init.lua    | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/modules/programs/nvim/default.nix b/modules/programs/nvim/default.nix
index cd170f4..948ac08 100644
--- a/modules/programs/nvim/default.nix
+++ b/modules/programs/nvim/default.nix
@@ -76,6 +76,7 @@ in
         nvim-cmp
         nvim-lspconfig
         nvim-surround
+        nvim-tree-lua
         nvim-treesitter-textsubjects
         nvim-treesitter.withAllGrammars
         nvim-ts-context-commentstring
diff --git a/modules/programs/nvim/init.lua b/modules/programs/nvim/init.lua
index a2479b1..74c3079 100644
--- a/modules/programs/nvim/init.lua
+++ b/modules/programs/nvim/init.lua
@@ -448,3 +448,14 @@ require("nvim-lastplace").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 })

From bf5a280f343d1da5460a81ffa67e71a740d3faac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20B=C3=B6hme?= <mail@moritzboeh.me>
Date: Sun, 19 Feb 2023 13:24:22 +0100
Subject: [PATCH 3/3] nvim: formatting and style

---
 modules/programs/nvim/default.nix |  6 +++---
 modules/programs/nvim/init.lua    | 10 ++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/modules/programs/nvim/default.nix b/modules/programs/nvim/default.nix
index 948ac08..554da79 100644
--- a/modules/programs/nvim/default.nix
+++ b/modules/programs/nvim/default.nix
@@ -54,8 +54,6 @@ in
         yamlfmt
       ];
       plugins = with pkgs.vimPlugins; [
-        nvim-autopairs
-        nvim-lastplace
         catppuccin-nvim
         cmp-nvim-lsp
         cmp-spell
@@ -65,6 +63,7 @@ in
         copilot-lua
         dashboard-nvim
         formatter-nvim
+        gitsigns-nvim
         lsp_lines-nvim
         lspkind-nvim
         lualine-lsp-progress
@@ -73,7 +72,9 @@ in
         neogit
         noice-nvim
         nui-nvim # for noice-nvim
+        nvim-autopairs
         nvim-cmp
+        nvim-lastplace
         nvim-lspconfig
         nvim-surround
         nvim-tree-lua
@@ -85,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 74c3079..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 = {
@@ -447,7 +445,7 @@ 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