From 94b58381755b0329e2aa29f0766d4553c84e0aed Mon Sep 17 00:00:00 2001
From: Venkatesan Ravi <venkyrocker7777@gmail.com>
Date: Thu, 3 Apr 2025 06:27:59 -0700
Subject: [PATCH] lsp/lsp-aga: add catppuccin integration (#779)

Co-authored-by: raf <raf@notashelf.dev>
---
 docs/release-notes/rl-0.8.md               |  1 +
 modules/plugins/lsp/lspsaga/lspsaga.nix    | 29 ++++++++++++++++------
 modules/plugins/theme/supported-themes.nix | 25 ++++++++++---------
 3 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 368df9f5..48d9e05f 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -292,6 +292,7 @@
 
 - Add lint (luacheck) and formatting (stylua) support for Lua.
 - Add lint (markdownlint-cli2) support for Markdown.
+- Add catppuccin integration for Lspsaga.
 
 [tebuevd](https://github.com/tebuevd):
 
diff --git a/modules/plugins/lsp/lspsaga/lspsaga.nix b/modules/plugins/lsp/lspsaga/lspsaga.nix
index 39ce6298..570cee1a 100644
--- a/modules/plugins/lsp/lspsaga/lspsaga.nix
+++ b/modules/plugins/lsp/lspsaga/lspsaga.nix
@@ -6,6 +6,19 @@
   inherit (lib.modules) mkRemovedOptionModule;
   inherit (lib.options) mkOption mkEnableOption;
   inherit (lib.nvim.types) borderType mkPluginSetupOption;
+  inherit (lib.nvim.lua) mkLuaInline;
+
+  uiKindSetupOpts =
+    if config.vim.theme.enable && config.vim.theme.name == "catppuccin"
+    then {
+      ui.kind =
+        mkLuaInline
+        # lua
+        ''
+          require("catppuccin.groups.integrations.lsp_saga").custom_kind()
+        '';
+    }
+    else {};
 in {
   imports = [
     (mkRemovedOptionModule ["vim" "lsp" "lspsaga" "mappings"] ''
@@ -21,12 +34,14 @@ in {
   options.vim.lsp.lspsaga = {
     enable = mkEnableOption "LSP Saga";
 
-    setupOpts = mkPluginSetupOption "lspsaga" {
-      border_style = mkOption {
-        type = borderType;
-        default = config.vim.ui.borders.globalStyle;
-        description = "Border type, see {command}`:help nvim_open_win`";
-      };
-    };
+    setupOpts =
+      mkPluginSetupOption "lspsaga" {
+        border_style = mkOption {
+          type = borderType;
+          default = config.vim.ui.borders.globalStyle;
+          description = "Border type, see {command}`:help nvim_open_win`";
+        };
+      }
+      // uiKindSetupOpts;
   };
 }
diff --git a/modules/plugins/theme/supported-themes.nix b/modules/plugins/theme/supported-themes.nix
index 0b5cb90b..2b427871 100644
--- a/modules/plugins/theme/supported-themes.nix
+++ b/modules/plugins/theme/supported-themes.nix
@@ -66,21 +66,22 @@ in {
         transparent_background = ${boolToString transparent},
         term_colors = true,
         integrations = {
-      	  nvimtree = {
-      		  enabled = true,
-      		  transparent_panel = ${boolToString transparent},
-      		  show_root = true,
-      	  },
+          nvimtree = {
+            enabled = true,
+            transparent_panel = ${boolToString transparent},
+            show_root = true,
+          },
 
           hop = true,
-      	  gitsigns = true,
-      	  telescope = true,
-      	  treesitter = true,
+          gitsigns = true,
+          telescope = true,
+          treesitter = true,
           treesitter_context = true,
-      	  ts_rainbow = true,
+          ts_rainbow = true,
           fidget = true,
           alpha = true,
           leap = true,
+          lsp_saga = true,
           markdown = true,
           noice = true,
           notify = true, -- nvim-notify
@@ -106,9 +107,9 @@ in {
       style' =
         warnIf (style == "light") "oxocarbon: light theme is not well-supported" style;
     in ''
-       require('oxocarbon')
-       vim.opt.background = "${style'}"
-       vim.cmd.colorscheme = "oxocarbon"
+      require('oxocarbon')
+      vim.opt.background = "${style'}"
+      vim.cmd.colorscheme = "oxocarbon"
       ${optionalString transparent ''
         vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
         vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })