Merge branch 'master' of github.com:aktersnurra/nvim

1 files changed, 12 insertions, 14 deletions

diff --git a/fnl/config/harpoon.fnl b/fnl/config/harpoon.fnl
index 0c3ca5e..21f1b27 100644
--- a/fnl/config/harpoon.fnl
+++ b/fnl/config/harpoon.fnl
@@ -1,18 +1,16 @@
 ;; Harpoon files for navigation.
-(module config.harpoon {autoload {: util nvim aniseed.nvim}})
+(module config.harpoon {autoload {util config.util nvim aniseed.nvim}})
 
 (def- opts {})
 
-(util.use-config :harpoon opts)
-(nvim.set_keymap
-  "n"
-  "<tab>"
-  "<cmd>lua require('telescope').extensions.harpoon.marks(require('telescope.themes').get_dropdown{previewer = false, initial_mode='normal', prompt_title='Harpoon'})<cr>"
-  opts
-)
-(nvim.set_keymap
-  "n"
-  "<s-tab>"
-  "<cmd>lua require('telescope.builtin').buffers(require('telescope.themes').get_dropdown{previewer = false, initial_mode='normal'})<cr>"
-  opts
-)
+(util.setup :harpoon opts)
+(let [telescope (require :telescope)]
+  (telescope.load_extension :harpoon))
+
+(nvim.set_keymap :n :<tab>
+                 "<cmd>lua require('telescope').extensions.harpoon.marks(require('telescope.themes').get_dropdown{previewer = false, initial_mode='normal', prompt_title='Harpoon'})<cr>"
+                 opts)
+
+(nvim.set_keymap :n :<s-tab>
+                 "<cmd>lua require('telescope.builtin').buffers(require('telescope.themes').get_dropdown{previewer = false, initial_mode='normal'})<cr>"
+                 opts)