modules/programs/nvim/init.lua

@@ -48,64 +48,59 @@ require("nvim-treesitter.configs").setup({
   },
 })
 
--- load cmp on InsertEnter
-vim.api.nvim_create_autocmd("InsertEnter", {
-  callback = function()
-    local cmp = require("cmp")
-    local luasnip = require("luasnip")
-    require("copilot_cmp").setup()
+local cmp = require("cmp")
+local luasnip = require("luasnip")
+require("copilot_cmp").setup()
 
-    cmp.setup({
-      formatting = {
-        format = require("lspkind").cmp_format({
-          mode = "symbol", -- show only symbol annotations
-          maxwidth = 50, -- prevent the popup from showing more than provided characters
-          ellipsis_char = "...", -- when popup menu exceed maxwidth, the truncated part would show ellipsis_char instead
-          symbol_map = {
-            Copilot = "",
-          },
-        }),
+cmp.setup({
+  formatting = {
+    format = require("lspkind").cmp_format({
+      mode = "symbol", -- show only symbol annotations
+      maxwidth = 50, -- prevent the popup from showing more than provided characters
+      ellipsis_char = "...", -- when popup menu exceed maxwidth, the truncated part would show ellipsis_char instead
+      symbol_map = {
+        Copilot = "",
       },
-      snippet = {
-        -- REQUIRED - you must specify a snippet engine
-        expand = function(args)
-          require("luasnip").lsp_expand(args.body)
-        end,
-      },
-      mapping = cmp.mapping.preset.insert({
-        ["<C-b>"] = cmp.mapping.scroll_docs(-4),
-        ["<C-f>"] = cmp.mapping.scroll_docs(4),
-        ["<C-Space>"] = cmp.mapping.complete(),
-        ["<C-e>"] = cmp.mapping.abort(),
-        ["<CR>"] = cmp.mapping.confirm({ select = true }),
-        ["<Tab>"] = cmp.mapping(function(fallback)
-          if cmp.visible() then
-            cmp.select_next_item()
-          elseif luasnip.expand_or_jumpable() then
-            luasnip.expand_or_jump()
-          else
-            fallback()
-          end
-        end, { "i", "s" }),
-        ["<S-Tab>"] = cmp.mapping(function(fallback)
-          if cmp.visible() then
-            cmp.select_prev_item()
-          elseif luasnip.jumpable(-1) then
-            luasnip.jump(-1)
-          else
-            fallback()
-          end
-        end, { "i", "s" }),
-      }),
-      sources = {
-        { name = "buffer", priority = 1 },
-        { name = "copilot", priority = 8 },
-        { name = "luasnip", priority = 7 },
-        { name = "nvim_lsp", priority = 9 },
-        { name = "orgmode", priority = 9 },
-      },
-    })
-  end,
+    }),
+  },
+  snippet = {
+    -- REQUIRED - you must specify a snippet engine
+    expand = function(args)
+      require("luasnip").lsp_expand(args.body)
+    end,
+  },
+  mapping = cmp.mapping.preset.insert({
+    ["<C-b>"] = cmp.mapping.scroll_docs(-4),
+    ["<C-f>"] = cmp.mapping.scroll_docs(4),
+    ["<C-Space>"] = cmp.mapping.complete(),
+    ["<C-e>"] = cmp.mapping.abort(),
+    ["<CR>"] = cmp.mapping.confirm({ select = true }),
+    ["<Tab>"] = cmp.mapping(function(fallback)
+      if cmp.visible() then
+        cmp.select_next_item()
+      elseif luasnip.expand_or_jumpable() then
+        luasnip.expand_or_jump()
+      else
+        fallback()
+      end
+    end, { "i", "s" }),
+    ["<S-Tab>"] = cmp.mapping(function(fallback)
+      if cmp.visible() then
+        cmp.select_prev_item()
+      elseif luasnip.jumpable(-1) then
+        luasnip.jump(-1)
+      else
+        fallback()
+      end
+    end, { "i", "s" }),
+  }),
+  sources = {
+    { name = "buffer", priority = 1 },
+    { name = "copilot", priority = 8 },
+    { name = "luasnip", priority = 7 },
+    { name = "nvim_lsp", priority = 9 },
+    { name = "orgmode", priority = 9 },
+  },
 })
 
 ---merge tables

overlays/default.nix

@@ -5,5 +5,4 @@ lib.composeManyExtensions [
   (import ./packages.nix { inherit inputs lib; })
   (import ./vimPlugins.nix { inherit inputs lib; })
   (import ./wayland.nix { inherit inputs lib; })
-  (import ./lib.nix { inherit inputs lib; })
 ]

overlays/lib.nix

@@ -1,5 +0,0 @@
-{ lib, inputs }:
-
-final: prev: {
-  inherit lib;
-}