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,41 +85,39 @@ in {
         internal = true;
       };
       term_colors = mkEnableOption' "term_colors";
-      integrations =
+      integrations = {
-        {
+        nvimtree = {
-          nvimtree = {
+          enabled = mkEnableOption' "enabled";
-            enabled = mkEnableOption' "enabled";
+          transparent_panel = mkOption {
-            transparent_panel = mkOption {
+            type = bool;
-              type = bool;
+            default = cfg.transparent;
-              default = cfg.transparent;
-            };
-            show_root = mkEnableOption' "show_root";
           };
+          show_root = mkEnableOption' "show_root";
+        };
 
-          navic = {
+        hop = mkEnableOption' "hop";
-            enabled = mkEnableOption' "enabled";
+        gitsigns = mkEnableOption' "gitsigns";
-            # lualine will set backgound to mantle
+        telescope = mkEnableOption' "telescope";
-            custom_bg = mkOption {
+        treesitter = mkEnableOption' "treesitter";
-              type = str;
+        treesitter_context = mkEnableOption' "treesitter_context";
-              default = "NONE";
+        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
+          custom_bg = mkOption {
+            type = str;
+            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,49 +147,40 @@ in {
   };
 
   gruvbox = {
-    setupOpts =
+    setupOpts = mkPluginSetupOption "gruvbox" {
-      mkPluginSetupOption "gruvbox" {
+      transparent_mode = mkOption {
-        transparent_mode = mkOption {
+        type = bool;
-          type = bool;
+        default = cfg.transparent;
-          default = cfg.transparent;
+        internal = true;
-          internal = true;
+      };
-        };
+      # transparent_mode = cfg.transparent;
-        italic =
+      # add neovim terminal colors
-          {
+      terminal_colors = mkEnableOption' "terminal_colors";
-            operators = mkEnableOption "operators";
+      undercurl = mkEnableOption' "undercurls";
-          }
+      underline = mkEnableOption' "underline";
-          // genAttrs [
+      bold = mkEnableOption' "bold";
-            "strings"
+      italic = {
-            "emphasis"
+        strings = mkEnableOption' "strings";
-            "comments"
+        emphasis = mkEnableOption' "emphasis";
-            "folds"
+        comments = mkEnableOption' "comments";
-          ] (name: mkEnableOption' name);
+        operators = mkEnableOption "operators";
-
+        folds = mkEnableOption' "folds";
-        contrast = mkOption {
+      };
-          type = str;
+      strikethrough = mkEnableOption' "strikethrough";
-          default = "";
+      invert_selection = mkEnableOption "invert_selection";
-        };
+      invert_signs = mkEnableOption "invert_signs";
-        # TODO: fix these
+      invert_tabline = mkEnableOption "invert_tabline";
-        # palette_overrides = mkLuaInline "{}";
+      invert_intend_guides = mkEnableOption "invert_intend_guides";
-        # overrides = mkLuaInline "{}";
+      inverse = mkEnableOption' "inverse";
-      }
+      contrast = mkOption {
-      // mergeAttrsList [
+        type = str;
-        (genAttrs [
+        default = "";
-          "terminal_colors"
+      };
-          "undercurls"
+      # TODO: fix these
-          "underline"
+      # palette_overrides = mkLuaInline "{}";
-          "bold"
+      # overrides = mkLuaInline "{}";
-          "strikethrough"
+      dim_inactive = mkEnableOption "dim_inactive";
-          "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 {