From 5774d8a1025168d57c8bfdfa66b76aa24153a59e Mon Sep 17 00:00:00 2001
From: LordMZTE <lord@mzte.de>
Date: Sun, 28 Apr 2024 19:57:19 +0200
Subject: [PATCH] mzte-nv: update catppuccin configuration

---
 mzte-nv/conf/lua/pluginconf/p-catppuccin.fnl | 27 ++++++++++++++++----
 mzte-nv/conf/lua/plugins.fnl                 |  6 ++---
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/mzte-nv/conf/lua/pluginconf/p-catppuccin.fnl b/mzte-nv/conf/lua/pluginconf/p-catppuccin.fnl
index d8e99e3..1c04bd8 100644
--- a/mzte-nv/conf/lua/pluginconf/p-catppuccin.fnl
+++ b/mzte-nv/conf/lua/pluginconf/p-catppuccin.fnl
@@ -5,19 +5,36 @@
 (local flavour :mocha)
 
 (catppuccin.setup {: flavour
+                   :term_colors true
+                   :dim_inactive {:enabled true}
                    ;; Enable all relevant integrations
+                   :default_integrations false
                    :integrations {:aerial true
                                   :cmp true
-                                  :dap {:enabled true :enable_ui true}
+                                  :dap true
+                                  :dap_ui true
                                   :gitsigns true
                                   :harpoon true
-                                  :native_lsp {:enabled true}
+                                  :markdown true
+                                  :native_lsp {:enabled true
+                                               :virtual_text (collect [_ diag (ipairs [:errors
+                                                                                       :hints
+                                                                                       :warnings
+                                                                                       :information])]
+                                                               (values diag
+                                                                       [:italic]))
+                                               :underlines (collect [_ diag (ipairs [:errors
+                                                                                     :hints
+                                                                                     :warnings
+                                                                                     :information])]
+                                                             (values diag
+                                                                     [:underline]))
+                                               :inlay_hints {:background true}}
                                   :neogit true
-                                  :noice true
-                                  :notify true
                                   :nvimtree true
                                   :rainbow_delimiters true
-                                  :telescope true
+                                  :semantic_tokens true
+                                  :telescope {:enabled true}
                                   :treesitter true
                                   :treesitter_context true}})
 
diff --git a/mzte-nv/conf/lua/plugins.fnl b/mzte-nv/conf/lua/plugins.fnl
index 54350d9..166a52d 100644
--- a/mzte-nv/conf/lua/plugins.fnl
+++ b/mzte-nv/conf/lua/plugins.fnl
@@ -5,7 +5,7 @@
 (let [path mztenv.reg.nvim_plugins]
   (when path
     (vim.opt.runtimepath:prepend (.. path "/*"))
-    (vim.opt.runtimepath:append (.. path "/*/after"))))
+    (vim.opt.runtimepath:append (.. path :/*/after))))
 
 ;; Plugins to load before nvim finishes startup
 (local startup-plugins [])
@@ -41,7 +41,7 @@
 (fn load-plugin [plugin]
   (let [(success ret) (pcall require (.. :pluginconf/p- plugin))]
     (when (not success)
-      (tset errors p ret))))
+      (tset errors plugin ret))))
 
 (each [_ p (ipairs startup-plugins)]
   (load-plugin p))
@@ -55,7 +55,7 @@
         (do
           (when (next errors)
             (vim.notify (accumulate [text "Errors loading plugin configs:\n" plugin err (pairs errors)]
-                          (.. text "  - " plugin ": " err))
+                          (.. text "  - " plugin ": " err "\n"))
                         vim.log.levels.error))
           (each [_ cb (ipairs mztenv.reg.plugin_load_callbacks)]
             (pcall cb))))))