From a3541e41838db71bee536123addf80645ebe0b48 Mon Sep 17 00:00:00 2001
From: Vegard Berg <vgberg@gmail.com>
Date: Tue, 23 May 2023 22:18:52 +0200
Subject: [PATCH] Added VSCode theme and keybindings

---
 fnl/foo.fnl               |  8 +++++---
 fnl/init.fnl              | 26 ++++++++++++++++++--------
 fnl/plugins/darkplus.fnl  |  4 ++++
 init.lua                  |  1 +
 lazy-lock.json            |  9 +++++----
 lua/plugins/which-key.lua |  5 +++++
 6 files changed, 38 insertions(+), 15 deletions(-)
 create mode 100644 fnl/plugins/darkplus.fnl

diff --git a/fnl/foo.fnl b/fnl/foo.fnl
index 7cd8054..c546df4 100644
--- a/fnl/foo.fnl
+++ b/fnl/foo.fnl
@@ -1,6 +1,8 @@
-(fn say-hi [name] (print (.. "Hello, " name)))
-(fn say-bye [name] (print (.. "Adios, " name)))
+(module foo)
+
+(defn say-hi [name] (print (.. "Hello, " name)))
+(defn say-bye [name] (print (.. "Adios, " name)))
 
 ;{:sayHi say-hi
  ;:sayBye say-bye)
-  
+
diff --git a/fnl/init.fnl b/fnl/init.fnl
index ee4fdb4..bc58a9e 100644
--- a/fnl/init.fnl
+++ b/fnl/init.fnl
@@ -1,5 +1,7 @@
-;; (module nvim-config
-;;  {autoload {nvim aniseed.nvim}}
+ (module nvim-config
+  {autoload {nvim aniseed.nvim
+             wk which-key}})
+
 
 ;;(vim.cmd.colorscheme "industry")
 ;; Done in init.lua instead, as it
@@ -20,12 +22,12 @@
               :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})})
+              :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"}
@@ -47,3 +49,11 @@
                       :sources (cmp.config.sources [{:name "path"}]
                                                    [{:name "cmdline"}])}))
 
+(defn- cmd [...]
+    (.. "<Cmd>" (table.concat [...] " ") "<CR>"))
+
+(wk.register
+    {"<leader>"
+       {:e [(cmd :NvimTreeToggle) "Toggle NvimTree"]
+        "<space>" [(cmd :Telescope :find_files) "Find file..."]}})
+
diff --git a/fnl/plugins/darkplus.fnl b/fnl/plugins/darkplus.fnl
new file mode 100644
index 0000000..8c95882
--- /dev/null
+++ b/fnl/plugins/darkplus.fnl
@@ -0,0 +1,4 @@
+(module plugins.darkplus {} {1 "lunarvim/darkplus.nvim"})
+
+;(def lazy false)
+
diff --git a/init.lua b/init.lua
index 9fb827b..59d8bd6 100644
--- a/init.lua
+++ b/init.lua
@@ -45,6 +45,7 @@ if not vim.loop.fs_stat(lazypath) then
 end
 vim.opt.rtp:prepend(lazypath)
 
+-- !!! AWAIT SETUP UNTIL FENNEL CODE IS LOADED !!!
 
 require("lazy").setup("plugins")
 
diff --git a/lazy-lock.json b/lazy-lock.json
index 9044161..f3a403b 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -8,20 +8,21 @@
   "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
   "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
   "conjure": { "branch": "master", "commit": "1dd96d90f53122225f698e58b50dee9ed760cf2e" },
+  "darkplus.nvim": { "branch": "master", "commit": "7c236649f0617809db05cd30fb10fed7fb01b83b" },
   "gitsigns.nvim": { "branch": "main", "commit": "c18b7ca0b5b50596722f3a1572eb9b8eb520c0f1" },
   "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" },
   "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-null-ls.nvim": { "branch": "main", "commit": "29ce60f9a16fef3de682a9365ef635f24ae92bf9" },
   "mason.nvim": { "branch": "main", "commit": "08b2fd308e0107eab9f0b59d570b69089fd0b522" },
-  "neodev.nvim": { "branch": "main", "commit": "2daabebac1b0b2ab7abba298c1a8f07a542866a6" },
+  "neodev.nvim": { "branch": "main", "commit": "781a090a30868373b37357a582b4fa7e7383298b" },
   "nord.nvim": { "branch": "master", "commit": "fab04b2dd4b64f4b1763b9250a8824d0b5194b8f" },
   "nui.nvim": { "branch": "main", "commit": "698e75814cd7c56b0dd8af4936bcef2d13807f3c" },
-  "null-ls.nvim": { "branch": "main", "commit": "77e53bc3bac34cc273be8ed9eb9ab78bcf67fa48" },
+  "null-ls.nvim": { "branch": "main", "commit": "13dd1fc13063681ca7e039436c88f6eca7e3e937" },
   "nvim-autopairs": { "branch": "master", "commit": "7747bbae60074acf0b9e3a4c13950be7a2dff444" },
   "nvim-cmp": { "branch": "main", "commit": "3ac8d6cd29c74ff482d8ea47d45e5081bfc3f5ad" },
-  "nvim-lspconfig": { "branch": "master", "commit": "1c13e529bd5683b54a39b633a560d2f00fcb25af" },
+  "nvim-lspconfig": { "branch": "master", "commit": "10142ff298f5fc3f8bf9d277c806593401b0fd06" },
   "nvim-notify": { "branch": "master", "commit": "f3024b912073774111202f5fa6518b0cd2a74432" },
   "nvim-tree.lua": { "branch": "master", "commit": "b1e074d2b52d45c8327b5b43a498b3d7e6c93b97" },
   "nvim-treesitter": { "branch": "master", "commit": "f2778bd1a28b74adf5b1aa51aa57da85adfa3d16" },
diff --git a/lua/plugins/which-key.lua b/lua/plugins/which-key.lua
index dcc9f50..fb7d557 100644
--- a/lua/plugins/which-key.lua
+++ b/lua/plugins/which-key.lua
@@ -6,6 +6,11 @@ return {
         vim.o.timeout = true
         vim.o.timeoutlen = 300
         require("which-key").setup({
+            key_labels = {
+                ["<space>"] = "SPC",
+                ["<cr>"] = "RET",
+                ["<tab>"] = "TAB",
+            }
         })
     end
 }