properly integrate catppuccin into nvim

mzte-nv/conf/lua/pluginconf/p-catppuccin.fnl

@@ -0,0 +1,19 @@
+(local catppuccin (require :catppuccin))
+
+(catppuccin.setup {;; Enable all relevant integrations
+                   :integrations {:aerial true
+                                  :harpoon true
+                                  :gitsigns true
+                                  :neogit true
+                                  :noice true
+                                  :cmp true
+                                  :dap {:enabled true :enable_ui true}
+                                  :native_lsp {:enabled true}
+                                  :notify true
+                                  :nvimtree true
+                                  :treesitter true
+                                  :treesitter_context true
+                                  :ts_rainbow2 true
+                                  :telescope true}})
+
+(vim.cmd.colorscheme :catppuccin)

mzte-nv/conf/lua/pluginconf/p-dap.fnl

@@ -37,3 +37,15 @@
   (vim.keymap.set :n :fn dap.step_over mopt)
   (vim.keymap.set :n :fi dap.step_into mopt)
   (vim.keymap.set :n :fo dap.step_out mopt))
+
+;; Catppuccin compat
+(let [sign vim.fn.sign_define]
+  (sign :DapBreakpoint {:text "●"
+                        :texthl :DapBreakpoint
+                        :linehl ""
+                        :numhl ""})
+  (sign :DapBreakpointCondition {:text "●"
+                                 :texthl :DapBreakpointCondition
+                                 :linehl ""
+                                 :numhl ""})
+  (sign :DapLogPoint {:text "◆" :texthl :DapLogPoint :linehl "" :numhl ""}))

mzte-nv/conf/lua/pluginconf/p-treesitter.fnl

@@ -13,8 +13,7 @@
 (configs.setup {:highlight {:enable true}
                 :autotag {:enable true}
                 :indent {:enable true}
-                :rainbow {:enable true
-                          :hlgroups (fcollect [i 1 6] (.. :TSRainbow i))}
+                :rainbow {:enable true}
                 :playground {:enable true}
                 :incremental_selection {:enable true
                                         :keymaps {:init_selection :fv

mzte-nv/conf/lua/pluginconf/p-tsrainbow2.fnl

@@ -1,4 +0,0 @@
-(local colors ["#ff00be" "#ff7e00" "#64d200" "#00e6b6" "#00e1ff" "#9598ff"])
-
-(each [i c (ipairs colors)]
-  (vim.api.nvim_set_hl 0 (.. :TSRainbow i) {:fg c}))

mzte-nv/conf/lua/plugins.fnl

@@ -34,7 +34,7 @@
 
 (fn init [use]
   (use :wbthomason/packer.nvim)
-  (use {1 :catppuccin/nvim :as :catppuccin})
+  (use/pconf use :catppuccin/nvim :catppuccin {:as :catppuccin})
   (use {1 :lewis6991/gitsigns.nvim
         :config #((. (require :gitsigns) :setup) {})})
   (use :dag/vim-fish)
@@ -49,7 +49,7 @@
              {:requires :nvim-lua/plenary.nvim})
   (use/pconf use :windwp/nvim-autopairs :autopairs)
   (use :windwp/nvim-ts-autotag)
-  (use/pconf use :HiPhish/nvim-ts-rainbow2 :tsrainbow2)
+  (use :HiPhish/nvim-ts-rainbow2)
   (use/pconf use :akinsho/toggleterm.nvim :tterm)
   (use :DingDean/wgsl.vim)
   (use :rcarriga/nvim-notify)

mzte-nv/src/options.zig

@@ -50,7 +50,6 @@ pub fn initOptions() !void {
     setVar("g:zig_fmt_autosave", .{ .bool = false });
 
     // Other settings
-    try cmd("colorscheme catppuccin");
     try cmd("filetype plugin on");
 
     // Disable garbage providers