From 0c11d35b611d7bed9557c3e77e5a4aeec77152ba Mon Sep 17 00:00:00 2001
From: elkowar <5300871+elkowar@users.noreply.github.com>
Date: Sun, 2 Oct 2022 11:49:08 +0200
Subject: [PATCH] Update stuff

---
 nvim/.config/nvim/fnl/dots/keybinds.fnl        | 2 +-
 nvim/.config/nvim/fnl/dots/plugins.fnl         | 8 ++++----
 nvim/.config/nvim/fnl/dots/plugins/lsp.fnl     | 2 +-
 nvim/.config/nvim/fnl/dots/plugins/lspsaga.fnl | 8 ++++----
 nvim/.config/nvim/fnl/macros.fnl               | 5 -----
 5 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/nvim/.config/nvim/fnl/dots/keybinds.fnl b/nvim/.config/nvim/fnl/dots/keybinds.fnl
index 9ccbad6..e0e1f0e 100644
--- a/nvim/.config/nvim/fnl/dots/keybinds.fnl
+++ b/nvim/.config/nvim/fnl/dots/keybinds.fnl
@@ -41,7 +41,7 @@
 
 
 (defn format []
-  (if (a.some #$1.resolved_capabilities.document_formatting (vim.lsp.get_active_clients))
+  (if (a.some #$1.server_capabilities.documentFormatting (vim.lsp.get_active_clients))
     (vim.lsp.buf.formatting)
     (vim.cmd "Neoformat")))
 
diff --git a/nvim/.config/nvim/fnl/dots/plugins.fnl b/nvim/.config/nvim/fnl/dots/plugins.fnl
index db7430b..9043fde 100644
--- a/nvim/.config/nvim/fnl/dots/plugins.fnl
+++ b/nvim/.config/nvim/fnl/dots/plugins.fnl
@@ -131,10 +131,10 @@
   
   :neovim/nvim-lspconfig {}
 
-  :tami5/lspsaga.nvim {:after "vim-gruvbox8"
-                       :opt false 
-                       :branch "nvim6.0"
-                       :config #(require "dots.plugins.lspsaga")}
+  :glepnir/lspsaga.nvim {:after "vim-gruvbox8"
+                         :opt false 
+                         :branch "version_2.2"
+                         :config #(require "dots.plugins.lspsaga")}
 
   ; >>>
 
diff --git a/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl b/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl
index bdc85c3..88eff73 100644
--- a/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl
+++ b/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl
@@ -30,7 +30,7 @@
                                  ;:decorator ["`" "`"]}))
 
   ;(req dots.utils.highlight :LspDiagnosticsUnderlineError {:gui "underline"})
-  (if client.resolved_capabilities.document_highlight
+  (if client.server_capabilities.documentHighlight
     (do
       (utils.highlight "LspReferenceRead"  {:gui "underline"})
       (utils.highlight "LspReferenceText"  {:gui "underline"})
diff --git a/nvim/.config/nvim/fnl/dots/plugins/lspsaga.fnl b/nvim/.config/nvim/fnl/dots/plugins/lspsaga.fnl
index dc6bc2e..37437bf 100644
--- a/nvim/.config/nvim/fnl/dots/plugins/lspsaga.fnl
+++ b/nvim/.config/nvim/fnl/dots/plugins/lspsaga.fnl
@@ -7,11 +7,11 @@
 
 (saga.init_lsp_saga 
   {:border_style "single" ; single double round plus
-   :code_action_prompt {:enable true
-                        :sign false
-                        :virtual_text false}
+   :code_action_lightbulb {:enable true
+                           :sign false
+                           :virtual_text false}
    :code_action_keys {:quit "<esc>" :exec "<CR>"} 
-   :rename_action_keys {:quit "<esc>" :exec "<CR>"} 
+   :rename_action_quit "<esc>"
    :finder_action_keys {:quit "<esc>"
                         :open "<CR>" 
                         :vsplit "v" 
diff --git a/nvim/.config/nvim/fnl/macros.fnl b/nvim/.config/nvim/fnl/macros.fnl
index 3b089e1..70abf66 100644
--- a/nvim/.config/nvim/fnl/macros.fnl
+++ b/nvim/.config/nvim/fnl/macros.fnl
@@ -67,11 +67,6 @@
                 ,r# (. data# (+ i# 1))]
             ,...)))))
 
-  :if-let
-  (fn [[name value] ...]
-    `(let [,name ,value]
-       (when ,name ,...)))
- 
   :packer-use
   (fn [...]
     (let [a (require "aniseed.core")