Remove conjure and add cmp-treesitter

This commit is contained in:
Alexander Rosenberg 2022-11-30 03:52:37 -08:00
parent 6d2dabf488
commit 5bcd29c32a
Signed by: Zander671
GPG Key ID: 5FD0394ADBD72730

View File

@ -357,11 +357,6 @@
:IlluminatedWordText :IlluminatedWordText
{}))))) {})))))
;; Conjure (better lisp support)
(use! :Olical/conjure
:config
#(tset vim.g :conjure#filetype#fennel "conjure.client.fennel.stdio"))
;; Snippy ;; Snippy
(use! :dcampos/nvim-snippy (use! :dcampos/nvim-snippy
:config #(let [map (require :snippy.mapping)] :config #(let [map (require :snippy.mapping)]
@ -374,7 +369,8 @@
:hrsh7th/cmp-path :hrsh7th/cmp-path
:hrsh7th/cmp-cmdline :hrsh7th/cmp-cmdline
:hrsh7th/cmp-nvim-lsp :hrsh7th/cmp-nvim-lsp
:PaterJason/cmp-conjure { 1 :ray-x/cmp-treesitter
:after :nvim-cmp }
:dcampos/cmp-snippy ] :dcampos/cmp-snippy ]
:config #(let [cmp (require :cmp) :config #(let [cmp (require :cmp)
compare (require :cmp.config.compare)] compare (require :cmp.config.compare)]
@ -417,9 +413,23 @@
(cmp.mapping.select_prev_item (cmp.mapping.select_prev_item
{ :behavior cmp.SelectBehavior.Select }) { :behavior cmp.SelectBehavior.Select })
[ :i :c ]) } [ :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 :sources (cmp.config.sources
[{ :name "nvim_lsp" :priority 2 } [{ :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 "snippy" :priority 1 }
{ :name "buffer" :priority 0 } { :name "buffer" :priority 0 }
{ :name "path" :priority 0 }]) { :name "path" :priority 0 }])