Merge remote-tracking branch 'refs/remotes/origin/nixos' into nixos

modules/programs/nvim/plugins/lua/luasnip.lua

@@ -0,0 +1,24 @@
+local ls = require("luasnip")
+local types = require("luasnip.util.types")
+
+-- Every unspecified option will be set to the default.
+ls.setup({
+  history = true,
+
+  -- Update more often, :h events for more info.
+  update_events = "TextChanged,TextChangedI",
+  -- Snippets aren't automatically removed if their text is deleted.
+  -- `delete_check_events` determines on which events (:h events) a check for
+  -- deleted snippets is performed.
+  -- This can be especially useful when `history` is enabled.
+  delete_check_events = "TextChanged",
+  ext_opts = {
+    [types.choiceNode] = {
+      active = {
+        virt_text = { { "<--", "Error" } },
+      },
+    },
+  },
+})
+
+require("luasnip.loaders.from_lua").load({ paths = "~/.config/nvim/snippets" })

modules/programs/nvim/plugins/lua/nvim-cmp.lua

@@ -2,25 +2,17 @@ local cmp = require("cmp")
 local luasnip = require("luasnip")
 require("luasnip.loaders.from_vscode").lazy_load()
 
-local has_words_before = function()
-  if vim.api.nvim_buf_get_option(0, "buftype") == "prompt" then
-    return false
-  end
-  local line, col = unpack(vim.api.nvim_win_get_cursor(0))
-  return col ~= 0 and vim.api.nvim_buf_get_text(0, line - 1, 0, line - 1, col, {})[1]:match("^%s*$") == nil
-end
-
 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 = "",
-      },
     }),
   },
+  enabled = function()
+    return not luasnip.jumpable(1)
+  end,
   snippet = {
     -- REQUIRED - you must specify a snippet engine
     expand = function(args)
@@ -31,34 +23,51 @@ cmp.setup({
     ["<C-b>"] = cmp.mapping.scroll_docs(-4),
     ["<C-f>"] = cmp.mapping.scroll_docs(4),
     ["<C-Space>"] = cmp.mapping.complete(),
-    ["<C-e>"] = cmp.mapping.abort(),
+    ["<S-CR>"] = cmp.mapping.abort(),
     ["<CR>"] = cmp.mapping.confirm({ select = true }),
     ["<Tab>"] = cmp.mapping(function(fallback)
-      if cmp.visible() and has_words_before() then
+      if cmp.visible() then
         cmp.select_next_item({ behavior = cmp.SelectBehavior.Select })
-      elseif luasnip.expand_or_jumpable() then
-        luasnip.expand_or_jump()
+      elseif luasnip.jumpable(1) then
+        luasnip.jump(1)
       else
         fallback()
       end
     end, { "i", "s" }),
     ["<S-Tab>"] = cmp.mapping(function(fallback)
       if cmp.visible() then
-        cmp.select_prev_item()
+        cmp.select_prev_item({ behavior = cmp.SelectBehavior.Select })
       elseif luasnip.jumpable(-1) then
         luasnip.jump(-1)
       else
         fallback()
       end
     end, { "i", "s" }),
+    ["<C-n>"] = cmp.mapping(function(fallback)
+      if luasnip.choice_active() then
+        luasnip.change_choice(1)
+      else
+        fallback()
+      end
+    end, { "i", "s" }),
+    ["<C-p>"] = cmp.mapping(function(fallback)
+      if luasnip.choice_active() then
+        luasnip.change_choice(-1)
+      else
+        fallback()
+      end
+    end, { "i", "s" }),
   }),
-  sources = {
+  sources = cmp.config.sources({
     { name = "async_path", priority = 1 },
-    { name = "buffer", priority = 1 },
-    { name = "luasnip", priority = 2 },
-    { name = "copilot", priority = 3 },
-    { name = "nvim_lsp", priority = 3 },
-  },
+    { name = "nvim_lsp", priority = 2 },
+    { name = "nvim_lsp_signature_help", priority = 3 },
+    { name = "luasnip", priority = 4 },
+  }, {
+    { name = "async_path" },
+    { name = "buffer" },
+    { name = "spell" },
+  }),
 })
 
 -- Set configuration for specific filetype.

modules/programs/nvim/plugins/lua/nvim-lspconfig.lua

@@ -126,6 +126,7 @@ end
 
 local servers = {
   "bashls",
+  "gleam",
   "gopls",
   "nil_ls",
   "nixd",