From a79693df58d8a554b906253d9471110d36ce14bc Mon Sep 17 00:00:00 2001
From: Vegard Berg <myrkvi@322-VEGBER4.knowit.local>
Date: Tue, 23 May 2023 11:26:04 +0200
Subject: [PATCH] Moved more config to be in Fennel

---
 fnl/init.fnl   | 32 ++++++++++++++++++++++++++++++++
 init.lua       |  3 +++
 lazy-lock.json |  6 ++++--
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/fnl/init.fnl b/fnl/init.fnl
index 6cbd9ba..fef9568 100644
--- a/fnl/init.fnl
+++ b/fnl/init.fnl
@@ -14,3 +14,35 @@
 (set vim.opt.expandtab true)
 (set vim.opt.mouse "a")
 
+(let [cmp (require :cmp)
+      luasnip (require :luasnip)]
+  (cmp.setup {:snippet {:expand (fn [args] (luasnip.lsp_expand args.body))}
+              :window {:completion (cmp.config.window.bordered)
+                       :documentation (cmp.config.window.bordered)}
+
+              :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})})
+
+              :sources (cmp.config.sources
+                         [{:name "nvim_lsp"}
+                          {:name "luasnip"}
+                          {:name "buffer"}])})
+
+  (cmp.setup.filetype "gitcommit"
+                      {:sources (cmp.config.sources
+                                  [{:name "cmp_git"}]
+                                  [{:name "buffer"}])})
+
+  (cmp.setup.cmdline ["/" "?"]
+                     {:mapping (cmp.mapping.preset.cmdline)
+                      :sources [{:name "buffer"}]})
+
+  (cmp.setup.cmdline ":"
+                     {:mapping (cmp.mapping.preset.cmdline)
+                      :sources (cmp.config.sources [{:name "path"}]
+                                                   [{:name "cmdline"}])}))
+
diff --git a/init.lua b/init.lua
index 4e94896..18e6b87 100644
--- a/init.lua
+++ b/init.lua
@@ -53,6 +53,7 @@ require("lazy").setup("plugins")
 ░█░█░▀▄▀░░█░░█░█░▄▄▄░█░░░█░█░█▀▀
 ░▀░▀░░▀░░▀▀▀░▀░▀░░░░░▀▀▀░▀░▀░▀░░
 --]==========]
+--[==[
 local cmp = require'cmp'
 
 cmp.setup({
@@ -110,3 +111,5 @@ sources = cmp.config.sources({
 
 -- Set up lspconfig.
 local capabilities = require('cmp_nvim_lsp').default_capabilities()
+--]==]
+
diff --git a/lazy-lock.json b/lazy-lock.json
index a7fe3da..9bbf287 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -12,13 +12,15 @@
   "lazy.nvim": { "branch": "main", "commit": "6610b15dfd76f7992423916e2b87f031881d7b25" },
   "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "c55d18f3947562e699d34d89681edbf9f0e250d3" },
+  "mason-null-ls.nvim": { "branch": "main", "commit": "54d702020bf94e4eefd357f0b738317af30217eb" },
   "mason.nvim": { "branch": "main", "commit": "08b2fd308e0107eab9f0b59d570b69089fd0b522" },
-  "neodev.nvim": { "branch": "main", "commit": "781a090a30868373b37357a582b4fa7e7383298b" },
+  "neodev.nvim": { "branch": "main", "commit": "2daabebac1b0b2ab7abba298c1a8f07a542866a6" },
   "nord.nvim": { "branch": "master", "commit": "fab04b2dd4b64f4b1763b9250a8824d0b5194b8f" },
   "nui.nvim": { "branch": "main", "commit": "698e75814cd7c56b0dd8af4936bcef2d13807f3c" },
+  "null-ls.nvim": { "branch": "main", "commit": "77e53bc3bac34cc273be8ed9eb9ab78bcf67fa48" },
   "nvim-autopairs": { "branch": "master", "commit": "7747bbae60074acf0b9e3a4c13950be7a2dff444" },
   "nvim-cmp": { "branch": "main", "commit": "3ac8d6cd29c74ff482d8ea47d45e5081bfc3f5ad" },
-  "nvim-lspconfig": { "branch": "master", "commit": "10142ff298f5fc3f8bf9d277c806593401b0fd06" },
+  "nvim-lspconfig": { "branch": "master", "commit": "1c13e529bd5683b54a39b633a560d2f00fcb25af" },
   "nvim-notify": { "branch": "master", "commit": "f3024b912073774111202f5fa6518b0cd2a74432" },
   "nvim-tree.lua": { "branch": "master", "commit": "b1e074d2b52d45c8327b5b43a498b3d7e6c93b97" },
   "nvim-treesitter": { "branch": "master", "commit": "f2778bd1a28b74adf5b1aa51aa57da85adfa3d16" },