From 96fc1f6685c63a2fc13e86cc72763bd2a2525e24 Mon Sep 17 00:00:00 2001
From: Proctor <steven.proctor@rate.com>
Date: Tue, 30 Nov 2021 20:31:18 -0600
Subject: [PATCH] Update lsp install plugins and fix treesitter search

---
 .../nvim/fnl/dotfiles/plugin/lspconfig.fnl        | 15 +++++++++------
 .../nvim/fnl/dotfiles/plugin/telescope.fnl        |  2 +-
 nvim/.config/nvim/fnl/dotfiles/plugins.fnl        |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/nvim/.config/nvim/fnl/dotfiles/plugin/lspconfig.fnl b/nvim/.config/nvim/fnl/dotfiles/plugin/lspconfig.fnl
index 2c22333..9b108d4 100644
--- a/nvim/.config/nvim/fnl/dotfiles/plugin/lspconfig.fnl
+++ b/nvim/.config/nvim/fnl/dotfiles/plugin/lspconfig.fnl
@@ -95,7 +95,7 @@
 
   (print "LSP Client Attached."))
 
-(let [lspi (require :lspinstall)]
+(let [lspi (require :nvim-lsp-installer)]
   (when lspi
 
     (defn lsp-execute-command [cmd ...]
@@ -109,11 +109,14 @@
                                       :arguments args})))
 
     (defn setup-servers []
-      (lspi.setup)
-      (let [lspconfig (require :lspconfig)
-            servers (lspi.installed_servers)]
-        (each [_ server (pairs servers)]
-          ((. lspconfig server :setup) {:on_attach on_attach :flags {:debounce_text_changes 150} }))))
+      (lspi.on_server_ready (fn [server]
+                              (let [opts {:on_attach on_attach :flags {:debounce_text_changes 150} }]
+                                (server:setup opts))))
+      ;; (let [lspconfig (require :lspconfig)
+      ;;       servers (lspi.get_installed_servers)]
+      ;;   (each [_ server (pairs servers)]
+      ;;     (server.setup {:on_attach on_attach :flags {:debounce_text_changes 150} })))
+      )
 
     (defn on-post-install []
       (setup-servers)
diff --git a/nvim/.config/nvim/fnl/dotfiles/plugin/telescope.fnl b/nvim/.config/nvim/fnl/dotfiles/plugin/telescope.fnl
index dc353f0..2e390f8 100644
--- a/nvim/.config/nvim/fnl/dotfiles/plugin/telescope.fnl
+++ b/nvim/.config/nvim/fnl/dotfiles/plugin/telescope.fnl
@@ -7,7 +7,7 @@
   {:defaults
    {:vimgrep_arguments ["ag" "--nocolor" "--noheading"
                         "--number" "--column" "--nobreak"
-                        "--smart-case" "--hidden" "--follow" "--skip-vcs-ignores"
+                        "--smart-case" "--hidden" "--follow" ; "--skip-vcs-ignores"
                         ; "-g" "!.git/"
                         ]}})
 
diff --git a/nvim/.config/nvim/fnl/dotfiles/plugins.fnl b/nvim/.config/nvim/fnl/dotfiles/plugins.fnl
index b6c8a76..d56969e 100644
--- a/nvim/.config/nvim/fnl/dotfiles/plugins.fnl
+++ b/nvim/.config/nvim/fnl/dotfiles/plugins.fnl
@@ -39,7 +39,6 @@
    :hrsh7th/nvim-compe {:mod :compe} ; autocomplete
    :jiangmiao/auto-pairs {} ; backets, parens, and quotes in pairs
    :junegunn/vim-easy-align {:mod :easyalign}
-   :kabouzeid/nvim-lspinstall {} ; NeoVim lsp server installs
    :kovisoft/paredit {}
    :kristijanhusak/vim-dadbod-completion {}
    :kristijanhusak/vim-dadbod-ui {}
@@ -63,6 +62,7 @@
    :tpope/vim-unimpaired {}
    :tpope/vim-vinegar {}
    :wbthomason/packer.nvim {:mod :packer}
+   :williamboman/nvim-lsp-installer {} ; NeoVim lsp server installs
 
    ; :luochen1990/rainbow {}
    ; :thecontinium/asyncomplete-conjure.vim {}