Refactor config loading

1 files changed, 92 insertions, 79 deletions

diff --git a/fnl/config/telescope.fnl b/fnl/config/telescope.fnl
index ac3c33c..ce4fb9c 100644
--- a/fnl/config/telescope.fnl
+++ b/fnl/config/telescope.fnl
@@ -1,82 +1,95 @@
 ;; Telescope a highly extendable fuzzy finder over lists.
-(module config.telescope {autoload {util config.util nvim aniseed.nvim}})
 
-(def- opts {:noremap true :silent true})
+(local opts {:noremap true :silent true})
 
-(let [telescope (util.prequire :telescope)]
-  (let [actions (require :telescope.actions)]
-    (telescope.setup {:defaults {:prompt_prefix "   "
-                                 :selection_caret "> "
-                                 :path_display [:smart]
-                                 :color_devicons false
-                                 :vimgrep_arguments [:rg
-                                                     :--color=never
-                                                     :--no-heading
-                                                     :--with-filename
-                                                     :--line-number
-                                                     :--column
-                                                     :--smart-case
-                                                     :--hidden]
-                                 :mappings {:i {:<C-n> actions.cycle_history_next
-                                                :<C-p> actions.cycle_history_prev
-                                                :<C-j> actions.move_selection_next
-                                                :<C-k> actions.move_selection_previous
-                                                :<C-c> actions.close
-                                                :<Down> actions.move_selection_next
-                                                :<Up> actions.move_selection_previous
-                                                :<CR> actions.select_default
-                                                :<C-x> actions.select_horizontal
-                                                :<C-v> actions.select_vertical
-                                                :<C-t> actions.select_tab
-                                                :<C-u> actions.preview_scrolling_up
-                                                :<C-d> actions.preview_scrolling_down
-                                                :<PageUp> actions.results_scrolling_up
-                                                :<PageDown> actions.results_scrolling_down
-                                                :<Tab> (+ actions.toggle_selection
-                                                          actions.move_selection_worse)
-                                                :<S-Tab> (+ actions.toggle_selection
-                                                            actions.move_selection_better)
-                                                :<C-q> (+ actions.send_to_qflist
-                                                          actions.open_qflist)
-                                                :<M-q> (+ actions.send_selected_to_qflist
-                                                          actions.open_qflist)
-                                                :<C-l> actions.complete_tag
-                                                :<C-_> actions.which_key}
-                                            :n {:<esc> actions.close
-                                                :<CR> actions.select_default
-                                                :<C-x> actions.select_horizontal
-                                                :<C-v> actions.select_vertical
-                                                :<C-t> actions.select_tab
-                                                :<Tab> (+ actions.toggle_selection
-                                                          actions.move_selection_worse)
-                                                :<S-Tab> (+ actions.toggle_selection
-                                                            actions.move_selection_better)
-                                                :<C-q> (+ actions.send_to_qflist
-                                                          actions.open_qflist)
-                                                :<M-q> (+ actions.send_selected_to_qflist
-                                                          actions.open_qflist)
-                                                :j actions.move_selection_next
-                                                :k actions.move_selection_previous
-                                                :H actions.move_to_top
-                                                :M actions.move_to_middle
-                                                :L actions.move_to_bottom
-                                                :<Down> actions.move_selection_next
-                                                :<Up> actions.move_selection_previous
-                                                :gg actions.move_to_top
-                                                :G actions.move_to_bottom
-                                                :q actions.close
-                                                :<C-u> actions.preview_scrolling_up
-                                                :<C-d> actions.preview_scrolling_down
-                                                :<PageUp> actions.results_scrolling_up
-                                                :<PageDown> actions.results_scrolling_down
-                                                :dd actions.delete_buffer
-                                                :? actions.which_key}}}
-                      :extensions {:fzf {:fuzzy true
-                                         :override_generic_sorter true
-                                         :override_file_sorter true
-                                         :case_mode :smart_case}}})
-    (telescope.load_extension :fzf)
-    (telescope.load_extension :frecency)
-    (telescope.load_extension :orgmode)
-    (telescope.load_extension :projects)
-    (telescope.load_extension :harpoon)))
+(fn setup []
+  (let [telescope (util.prequire :telescope)]
+    (let [actions (require :telescope.actions)]
+      (telescope.setup {:defaults {:prompt_prefix "   "
+                                   :selection_caret "> "
+                                   :path_display [:smart]
+                                   :color_devicons false
+                                   :vimgrep_arguments [:rg
+                                                       :--color=never
+                                                       :--no-heading
+                                                       :--with-filename
+                                                       :--line-number
+                                                       :--column
+                                                       :--smart-case
+                                                       :--hidden]
+                                   :mappings {:i {:<C-n> actions.cycle_history_next
+                                                  :<C-p> actions.cycle_history_prev
+                                                  :<C-j> actions.move_selection_next
+                                                  :<C-k> actions.move_selection_previous
+                                                  :<C-c> actions.close
+                                                  :<Down> actions.move_selection_next
+                                                  :<Up> actions.move_selection_previous
+                                                  :<CR> actions.select_default
+                                                  :<C-x> actions.select_horizontal
+                                                  :<C-v> actions.select_vertical
+                                                  :<C-t> actions.select_tab
+                                                  :<C-u> actions.preview_scrolling_up
+                                                  :<C-d> actions.preview_scrolling_down
+                                                  :<PageUp> actions.results_scrolling_up
+                                                  :<PageDown> actions.results_scrolling_down
+                                                  :<Tab> (+ actions.toggle_selection
+                                                            actions.move_selection_worse)
+                                                  :<S-Tab> (+ actions.toggle_selection
+                                                              actions.move_selection_better)
+                                                  :<C-q> (+ actions.send_to_qflist
+                                                            actions.open_qflist)
+                                                  :<M-q> (+ actions.send_selected_to_qflist
+                                                            actions.open_qflist)
+                                                  :<C-l> actions.complete_tag
+                                                  :<C-_> actions.which_key}
+                                              :n {:<esc> actions.close
+                                                  :<CR> actions.select_default
+                                                  :<C-x> actions.select_horizontal
+                                                  :<C-v> actions.select_vertical
+                                                  :<C-t> actions.select_tab
+                                                  :<Tab> (+ actions.toggle_selection
+                                                            actions.move_selection_worse)
+                                                  :<S-Tab> (+ actions.toggle_selection
+                                                              actions.move_selection_better)
+                                                  :<C-q> (+ actions.send_to_qflist
+                                                            actions.open_qflist)
+                                                  :<M-q> (+ actions.send_selected_to_qflist
+                                                            actions.open_qflist)
+                                                  :j actions.move_selection_next
+                                                  :k actions.move_selection_previous
+                                                  :H actions.move_to_top
+                                                  :M actions.move_to_middle
+                                                  :L actions.move_to_bottom
+                                                  :<Down> actions.move_selection_next
+                                                  :<Up> actions.move_selection_previous
+                                                  :gg actions.move_to_top
+                                                  :G actions.move_to_bottom
+                                                  :q actions.close
+                                                  :<C-u> actions.preview_scrolling_up
+                                                  :<C-d> actions.preview_scrolling_down
+                                                  :<PageUp> actions.results_scrolling_up
+                                                  :<PageDown> actions.results_scrolling_down
+                                                  :dd actions.delete_buffer
+                                                  :? actions.which_key}}}
+                        :extensions {:fzf {:fuzzy true
+                                           :override_generic_sorter true
+                                           :override_file_sorter true
+                                           :case_mode :smart_case}}})
+      (telescope.load_extension :fzf)
+      (telescope.load_extension :frecency)
+      (telescope.load_extension :orgmode)
+      (telescope.load_extension :projects)
+      (telescope.load_extension :harpoon))))
+
+{1 :nvim-telescope/telescope.nvim
+ :cmd :Telescope
+ :dependencies [:nvim-lua/popup.nvim
+                :nvim-telescope/telescope-frecency.nvim
+                :tami5/sqlite.lua
+                :ahmedkhalf/project.nvim
+                :nvim-lua/plenary.nvim
+                :nvim-telescope/telescope-fzf-native.nvim
+                :nvim-telescope/telescope-frecency.nvim
+                :joaomsa/telescope-orgmode.nvim]
+ :config (fn []
+           (setup))}