plugins/catppuccin: update integrations (#670)

* plugins/catppuccin: update integrations

* add TODOs

* update mini integration

* fix indent_blankline.scope_color

* sort; update values

* fix ci

* NormalNvim

* update todos

plugins/colorschemes/catppuccin.nix

@@ -146,21 +146,66 @@ in {
       integrations = {
         aerial = helpers.defaultNullOpts.mkBool false "";
 
+        alpha = helpers.defaultNullOpts.mkBool true "";
+
         barbar = helpers.defaultNullOpts.mkBool config.plugins.barbar.enable "";
 
+        barbecue = {
+          dim_dirname = helpers.defaultNullOpts.mkBool true "";
+
+          bold_basename = helpers.defaultNullOpts.mkBool true "";
+
+          dim_context = helpers.defaultNullOpts.mkBool false "";
+
+          alt_background = helpers.defaultNullOpts.mkBool false "";
+        };
+
         beacon = helpers.defaultNullOpts.mkBool false "";
 
+        # TODO: bufferline needs to be loaded after setting up catppuccin or it will highlight incorrectly
+        # use "akinsho/bufferline.nvim" {
+        #   after = "catppuccin",
+        #   config = function()
+        #     require("bufferline").setup {
+        #       highlights = require("catppuccin.groups.integrations.bufferline").get()
+        #     }
+        #   end
+        # }
+        # bufferline = helpers.defaultNullOpts.mkBool false "";
+
         cmp = helpers.defaultNullOpts.mkBool config.plugins.nvim-cmp.enable "";
 
         coc_nvim = helpers.defaultNullOpts.mkBool false "";
 
+        dap = {
+          enabled = helpers.defaultNullOpts.mkBool false "";
+
+          enable_ui = helpers.defaultNullOpts.mkBool false "";
+        };
+
         dashboard =
           helpers.defaultNullOpts.mkBool config.plugins.dashboard.enable "";
 
+        dropbar = {
+          enabled = helpers.defaultNullOpts.mkBool false "";
+
+          color_mode = helpers.defaultNullOpts.mkBool false "";
+        };
+
+        # TODO: feline requires additional setup
+        # local ctp_feline = require("catppuccin.groups.integrations.feline")
+        # ctp_feline.setup()
+        # require("feline").setup({
+        #     components = ctp_feline.get(),
+        # })
+        # feline = helpers.defaultNullOpts.mkBool false "";
+
         fern = helpers.defaultNullOpts.mkBool false "";
 
         fidget = helpers.defaultNullOpts.mkBool false "";
 
+        flash = helpers.defaultNullOpts.mkBool true "";
+
         gitgutter =
           helpers.defaultNullOpts.mkBool config.plugins.gitgutter.enable "";
 
@@ -174,97 +219,44 @@ in {
 
         hop = helpers.defaultNullOpts.mkBool false "";
 
-        illuminate = helpers.defaultNullOpts.mkBool false "";
+        illuminate = {
+          enabled = helpers.defaultNullOpts.mkBool config.plugins.illuminate.enable "";
+
+          lsp = helpers.defaultNullOpts.mkBool false "";
+        };
+
+        indent_blankline = {
+          enabled = helpers.defaultNullOpts.mkBool config.plugins.indent-blankline.enable "";
+
+          scope_color = helpers.defaultNullOpts.mkStr "" "";
+
+          colored_indent_levels = helpers.defaultNullOpts.mkBool false "";
+        };
 
         leap = helpers.defaultNullOpts.mkBool false "";
 
         lightspeed = helpers.defaultNullOpts.mkBool false "";
 
+        # TODO: lspsaga.setup call for custom kinds and colors
+        # require("lspsaga").setup {
+        #     ui = {
+        #         kind = require("catppuccin.groups.integrations.lsp_saga").custom_kind(),
+        #     },
+        # }
         lsp_saga =
           helpers.defaultNullOpts.mkBool config.plugins.lspsaga.enable "";
 
         lsp_trouble =
           helpers.defaultNullOpts.mkBool config.plugins.trouble.enable "";
 
-        markdown = helpers.defaultNullOpts.mkBool false "";
+        markdown = helpers.defaultNullOpts.mkBool true "";
 
         mason = helpers.defaultNullOpts.mkBool false "";
 
-        mini = helpers.defaultNullOpts.mkBool false "";
+        mini = {
-
-        neogit = helpers.defaultNullOpts.mkBool config.plugins.neogit.enable "";
-
-        neotest = helpers.defaultNullOpts.mkBool false "";
-
-        neotree =
-          helpers.defaultNullOpts.mkBool config.plugins.neo-tree.enable "";
-
-        noice = helpers.defaultNullOpts.mkBool config.plugins.noice.enable "";
-
-        notify = helpers.defaultNullOpts.mkBool config.plugins.notify.enable "";
-
-        nvimtree =
-          helpers.defaultNullOpts.mkBool config.plugins.nvim-tree.enable "";
-
-        octo = helpers.defaultNullOpts.mkBool false "";
-
-        overseer = helpers.defaultNullOpts.mkBool false "";
-
-        pounce = helpers.defaultNullOpts.mkBool false "";
-
-        sandwich = helpers.defaultNullOpts.mkBool false "";
-
-        semantic_tokens = helpers.defaultNullOpts.mkBool false "";
-
-        symbols_outline = helpers.defaultNullOpts.mkBool false "";
-
-        telekasten = helpers.defaultNullOpts.mkBool false "";
-
-        telescope =
-          helpers.defaultNullOpts.mkBool config.plugins.telescope.enable "";
-
-        treesitter =
-          helpers.defaultNullOpts.mkBool config.plugins.treesitter.enable "";
-
-        treesitter_context =
-          helpers.defaultNullOpts.mkBool config.plugins.treesitter.enable "";
-
-        ts_rainbow =
-          helpers.defaultNullOpts.mkBool
-          true "";
-
-        ts_rainbow2 = helpers.defaultNullOpts.mkBool true "";
-
-        rainbow_delimiters = helpers.defaultNullOpts.mkBool true "";
-
-        vim_sneak = helpers.defaultNullOpts.mkBool false "";
-
-        vimwiki = helpers.defaultNullOpts.mkBool false "";
-
-        which_key =
-          helpers.defaultNullOpts.mkBool config.plugins.which-key.enable "";
-
-        barbecue = {
-          dim_dirname = helpers.defaultNullOpts.mkBool true "";
-
-          bold_basename = helpers.defaultNullOpts.mkBool true "";
-
-          dim_context = helpers.defaultNullOpts.mkBool false "";
-
-          alt_background = helpers.defaultNullOpts.mkBool false "";
-        };
-
-        dap = {
           enabled = helpers.defaultNullOpts.mkBool false "";
 
-          enable_ui = helpers.defaultNullOpts.mkBool false "";
+          indentscope_color = helpers.defaultNullOpts.mkStr "" "";
-        };
-        indent_blankline = {
-          enabled =
-            helpers.defaultNullOpts.mkBool
-            config.plugins.indent-blankline.enable "";
-
-          colored_indent_levels = helpers.defaultNullOpts.mkBool false "";
         };
 
         native_lsp = {
@@ -305,13 +297,82 @@ in {
               helpers.defaultNullOpts.mkNullable (types.listOf types.str)
               ''[ "underline" ]'' "";
           };
+
+          inlay_hints = {
+            background = helpers.defaultNullOpts.mkBool true "";
+          };
         };
 
+        # TODO: require("nvim-navic").setup { highlight = true }
+        # or via nixvim options?:  plugins.navic.highlight = true
         navic = {
           enabled = helpers.defaultNullOpts.mkBool false "";
 
           custom_bg = helpers.defaultNullOpts.mkStr "NONE" "";
         };
+
+        neogit = helpers.defaultNullOpts.mkBool config.plugins.neogit.enable "";
+
+        neotest = helpers.defaultNullOpts.mkBool false "";
+
+        neotree =
+          helpers.defaultNullOpts.mkBool config.plugins.neo-tree.enable "";
+
+        noice = helpers.defaultNullOpts.mkBool config.plugins.noice.enable "";
+
+        NormalNvim = helpers.defaultNullOpts.mkBool false "";
+
+        notifier = helpers.defaultNullOpts.mkBool false "";
+
+        notify = helpers.defaultNullOpts.mkBool config.plugins.notify.enable "";
+
+        nvimtree =
+          helpers.defaultNullOpts.mkBool config.plugins.nvim-tree.enable "";
+
+        octo = helpers.defaultNullOpts.mkBool false "";
+
+        overseer = helpers.defaultNullOpts.mkBool false "";
+
+        pounce = helpers.defaultNullOpts.mkBool false "";
+
+        rainbow_delimiters = helpers.defaultNullOpts.mkBool true "";
+
+        sandwich = helpers.defaultNullOpts.mkBool false "";
+
+        semantic_tokens = helpers.defaultNullOpts.mkBool false "";
+
+        symbols_outline = helpers.defaultNullOpts.mkBool false "";
+
+        telekasten = helpers.defaultNullOpts.mkBool false "";
+
+        telescope = {
+          enabled = helpers.defaultNullOpts.mkBool config.plugins.telescope.enable "";
+
+          style = helpers.defaultNullOpts.mkStr "" "";
+        };
+
+        treesitter =
+          helpers.defaultNullOpts.mkBool config.plugins.treesitter.enable "";
+
+        treesitter_context =
+          helpers.defaultNullOpts.mkBool config.plugins.treesitter.enable "";
+
+        ts_rainbow =
+          helpers.defaultNullOpts.mkBool
+          true "";
+
+        ts_rainbow2 = helpers.defaultNullOpts.mkBool true "";
+
+        ufo = helpers.defaultNullOpts.mkBool true "";
+
+        vim_sneak = helpers.defaultNullOpts.mkBool false "";
+
+        vimwiki = helpers.defaultNullOpts.mkBool false "";
+
+        which_key =
+          helpers.defaultNullOpts.mkBool config.plugins.which-key.enable "";
+
+        window_picker = helpers.defaultNullOpts.mkBool false "";
       };
     };
   };

tests/test-sources/plugins/colorschemes/catppuccin.nix

@@ -41,9 +41,13 @@
         cmp = true;
         gitsigns = true;
         nvimtree = true;
-        telescope = true;
+        telescope = {
+          enabled = true;
+        };
         notify = false;
-        mini = false;
+        mini = {
+          enabled = false;
+        };
       };
     };
   };
@@ -64,18 +68,25 @@
         barbar = true;
         fidget = true;
         gitsigns = true;
-        illuminate = true;
+        illuminate = {
+          enabled = true;
+        };
         indent_blankline = {
           enabled = true;
           colored_indent_levels = true;
         };
         lsp_trouble = true;
-        mini = true;
+        mini = {
+          enabled = true;
+        };
         native_lsp.enabled = true;
         navic.enabled = true;
         nvimtree = true;
         overseer = true;
-        telescope = true;
+        telescope = {
+          enabled = true;
+          style = "nvchad";
+        };
         treesitter = true;
         treesitter_context = true;
         ts_rainbow2 = true;