From 5bcd29c32aecde8da41aacc2918e91fbe7db4a0c Mon Sep 17 00:00:00 2001
From: Alexander Rosenberg <zanderpkg@pm.me>
Date: Wed, 30 Nov 2022 03:52:37 -0800
Subject: [PATCH]  Remove conjure and add cmp-treesitter

---
 init.fnl | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/init.fnl b/init.fnl
index 15419ea..0a51039 100644
--- a/init.fnl
+++ b/init.fnl
@@ -357,11 +357,6 @@
                                                                :IlluminatedWordText 
                                                                {})))))
 
-  ;; Conjure (better lisp support)
-  (use! :Olical/conjure
-        :config
-        #(tset vim.g :conjure#filetype#fennel "conjure.client.fennel.stdio"))
-
   ;; Snippy
   (use! :dcampos/nvim-snippy
         :config #(let [map (require :snippy.mapping)]
@@ -374,7 +369,8 @@
                     :hrsh7th/cmp-path
                     :hrsh7th/cmp-cmdline
                     :hrsh7th/cmp-nvim-lsp
-                    :PaterJason/cmp-conjure
+                    { 1 :ray-x/cmp-treesitter
+                        :after :nvim-cmp }
                     :dcampos/cmp-snippy ]
         :config #(let [cmp (require :cmp)
                        compare (require :cmp.config.compare)]
@@ -417,9 +413,23 @@
                                   (cmp.mapping.select_prev_item 
                                     { :behavior cmp.SelectBehavior.Select })
                                   [ :i :c ]) }
+                         :formatting {
+                           :format (fn [entry vim_item]
+                                     (tset vim_item :menu
+                                           (. { :nvim_lsp "[LSP]"
+                                                :treesitter "[TS]"
+                                                :snippy "[Snippy]"
+                                                :buffer "[Buffer]"
+                                                :path "[Path]" }
+                                                entry.source.name))
+                                     vim_item)
+                         }
                          :sources (cmp.config.sources 
                                     [{ :name "nvim_lsp" :priority 2 }
-                                     { :name "conjure" :priority 2 }
+                                     { :name "snippy" :priority 1 }
+                                     { :name "buffer" :priority 0 }
+                                     { :name "path" :priority 0 }]
+                                    [{ :name "treesitter" :priority 2 }
                                      { :name "snippy" :priority 1 }
                                      { :name "buffer" :priority 0 }
                                      { :name "path" :priority 0 }])