modules/plugins/theme/supported-themes.nix

@@ -3,8 +3,9 @@
   lib,
 }: let
   inherit (lib.strings) hasPrefix optionalString;
-  inherit (lib.attrsets) genAttrs listToAttrs mergeAttrsList;
+  inherit (lib.attrsets) listToAttrs;
   inherit (lib.options) mkOption mkEnableOption;
+  inherit (lib.generators) mkLuaInline;
   inherit (lib.types) bool str;
   inherit (lib.nvim.types) hexColor mkPluginSetupOption;
   cfg = config.vim.theme;
@@ -84,8 +85,7 @@ in {
         internal = true;
       };
       term_colors = mkEnableOption' "term_colors";
-      integrations =
+      integrations = {
-        {
         nvimtree = {
           enabled = mkEnableOption' "enabled";
           transparent_panel = mkOption {
@@ -95,6 +95,20 @@ in {
           show_root = mkEnableOption' "show_root";
         };
 
+        hop = mkEnableOption' "hop";
+        gitsigns = mkEnableOption' "gitsigns";
+        telescope = mkEnableOption' "telescope";
+        treesitter = mkEnableOption' "treesitter";
+        treesitter_context = mkEnableOption' "treesitter_context";
+        ts_rainbow = mkEnableOption' "ts_rainbow";
+        fidget = mkEnableOption' "fidget";
+        alpha = mkEnableOption' "alpha";
+        leap = mkEnableOption' "leap";
+        markdown = mkEnableOption' "markdown";
+        noice = mkEnableOption' "noice";
+        # nvim-notify
+        notify = mkEnableOption' "notify";
+        which_key = mkEnableOption' "which_key";
         navic = {
           enabled = mkEnableOption' "enabled";
           # lualine will set backgound to mantle
@@ -103,22 +117,7 @@ in {
             default = "NONE";
           };
         };
-        }
+      };
-        // genAttrs [
-          "hop"
-          "gitsigns"
-          "telescope"
-          "treesitter"
-          "treesitter_context"
-          "ts_rainbow"
-          "fidget"
-          "alpha"
-          "leap"
-          "markdown"
-          "noice"
-          "notify"
-          "which_key"
-        ] (name: mkEnableOption' name);
     };
     setup = ''
       -- Catppuccin theme
@@ -148,24 +147,31 @@ in {
   };
 
   gruvbox = {
-    setupOpts =
+    setupOpts = mkPluginSetupOption "gruvbox" {
-      mkPluginSetupOption "gruvbox" {
       transparent_mode = mkOption {
         type = bool;
         default = cfg.transparent;
         internal = true;
       };
-        italic =
+      # transparent_mode = cfg.transparent;
-          {
+      # add neovim terminal colors
+      terminal_colors = mkEnableOption' "terminal_colors";
+      undercurl = mkEnableOption' "undercurls";
+      underline = mkEnableOption' "underline";
+      bold = mkEnableOption' "bold";
+      italic = {
+        strings = mkEnableOption' "strings";
+        emphasis = mkEnableOption' "emphasis";
+        comments = mkEnableOption' "comments";
         operators = mkEnableOption "operators";
-          }
+        folds = mkEnableOption' "folds";
-          // genAttrs [
+      };
-            "strings"
+      strikethrough = mkEnableOption' "strikethrough";
-            "emphasis"
+      invert_selection = mkEnableOption "invert_selection";
-            "comments"
+      invert_signs = mkEnableOption "invert_signs";
-            "folds"
+      invert_tabline = mkEnableOption "invert_tabline";
-          ] (name: mkEnableOption' name);
+      invert_intend_guides = mkEnableOption "invert_intend_guides";
-
+      inverse = mkEnableOption' "inverse";
       contrast = mkOption {
         type = str;
         default = "";
@@ -173,24 +179,8 @@ in {
       # TODO: fix these
       # palette_overrides = mkLuaInline "{}";
       # overrides = mkLuaInline "{}";
-      }
+      dim_inactive = mkEnableOption "dim_inactive";
-      // mergeAttrsList [
+    };
-        (genAttrs [
-          "terminal_colors"
-          "undercurls"
-          "underline"
-          "bold"
-          "strikethrough"
-          "inverse"
-        ] (name: mkEnableOption' name))
-        (genAttrs [
-          "invert_selection"
-          "invert_signs"
-          "invert_tabline"
-          "invert_intend_guides"
-          "dim_inactive"
-        ] (name: mkEnableOption name))
-      ];
     setup = ''
       -- Gruvbox theme
       vim.o.background = "${cfg.style}"

modules/plugins/theme/theme.nix

@@ -17,6 +17,7 @@
   };
 in {
   options.vim.theme = {
+    themes = supportedThemes;
     inherit (supportedThemes.${cfg.name}) setupOpts;
 
     enable = mkOption {