plugins: remove mkCompositeOptions from implementation

plugins/languages/markdown-preview.nix

@@ -51,7 +51,7 @@ in {
         A custom vim function name to open preview page. This function will receive url as param.
       '';
 
-      previewOptions = helpers.mkCompositeOption "Options for markdown render" {
+      previewOptions = {
         mkit = helpers.defaultNullOpts.mkNullable (types.listOf types.str) "[]" "markdown-it options for render";
         katex = helpers.defaultNullOpts.mkNullable (types.listOf types.str) "[]" "katex options for math";
         uml = helpers.defaultNullOpts.mkNullable (types.listOf types.str) "[]" "markdown-it-plantuml options";
@@ -108,7 +108,7 @@ in {
       mkdp_browser = mkIf (cfg.browser != null) cfg.browser;
       mkdp_echo_preview_url = mkIf (cfg.echoPreviewUrl != null) cfg.echoPreviewUrl;
       mkdp_browserfunc = mkIf (cfg.browserFunc != null) cfg.browserFunc;
-      mkdp_preview_options = mkIf (cfg.previewOptions != null) cfg.previewOptions;
+      mkdp_preview_options = cfg.previewOptions;
       mkdp_markdown_css = mkIf (cfg.markdownCss != null) cfg.markdownCss;
       mkdp_highlight_css = mkIf (cfg.highlightCss != null) cfg.highlightCss;
       mkdp_port = mkIf (cfg.port != null) cfg.port;

plugins/languages/rust.nix

@@ -35,7 +35,7 @@ in {
         Automatically call RustReloadWorkspace when writing to a Cargo.toml file.
       '';
 
-      inlayHints = helpers.mkCompositeOption "inlay hints" {
+      inlayHints = {
         auto = helpers.defaultNullOpts.mkBool true "automatically set inlay hints (type hints)";
 
         onlyCurrentLine = helpers.defaultNullOpts.mkBool false "Only show for current line";
@@ -71,7 +71,7 @@ in {
         highlight = helpers.defaultNullOpts.mkStr "Comment" "The color of the hints";
       };
 
-      hoverActions = helpers.mkCompositeOption "hover actions" {
+      hoverActions = {
         border =
           helpers.defaultNullOpts.mkBorder ''
             [
@@ -100,7 +100,7 @@ in {
           "whether the hover action window gets automatically focused";
       };
 
-      crateGraph = helpers.mkCompositeOption "create graph" {
+      crateGraph = {
         backend = helpers.defaultNullOpts.mkStr "x11" ''
           Backend used for displaying the graph
           see: https://graphviz.org/docs/outputs/
@@ -146,34 +146,30 @@ in {
             on_initialized = helpers.mkRaw cfg.onInitialized;
 
             reload_workspace_from_cargo_toml = cfg.reloadWorkspaceFromCargoToml;
-            inlay_hints = with cfg.inlayHints;
-              helpers.ifNonNull' cfg.inlayHints {
-                inherit auto;
-                only_current_line = onlyCurrentLine;
-                show_parameter_hints = showParameterHints;
-                parameter_hints_prefix = parameterHintsPrefix;
-                other_hints_prefix = otherHintsPrefix;
-                max_len_align = maxLenAlign;
-                max_len_align_padding = maxLenAlignPadding;
-                right_align = rightAlign;
-                right_align_padding = rightAlignPadding;
-                inherit highlight;
-              };
+            inlay_hints = with cfg.inlayHints; {
+              inherit auto;
+              only_current_line = onlyCurrentLine;
+              show_parameter_hints = showParameterHints;
+              parameter_hints_prefix = parameterHintsPrefix;
+              other_hints_prefix = otherHintsPrefix;
+              max_len_align = maxLenAlign;
+              max_len_align_padding = maxLenAlignPadding;
+              right_align = rightAlign;
+              right_align_padding = rightAlignPadding;
+              inherit highlight;
+            };
 
-            hover_actions = with cfg.hoverActions;
-              helpers.ifNonNull' cfg.hoverActions
-              {
-                inherit border;
-                max_width = maxWidth;
-                max_height = maxHeight;
-                auto_focus = autoFocus;
-              };
+            hover_actions = with cfg.hoverActions; {
+              inherit border;
+              max_width = maxWidth;
+              max_height = maxHeight;
+              auto_focus = autoFocus;
+            };
 
-            crate_graph = with cfg.crateGraph;
-              helpers.ifNonNull' cfg.crateGraph {
-                inherit backend output full;
-                enabled_graphviz_backends = enabledGraphvizBackends;
-              };
+            crate_graph = with cfg.crateGraph; {
+              inherit backend output full;
+              enabled_graphviz_backends = enabledGraphvizBackends;
+            };
           };
           server = {
             inherit (cfg.server) standalone;

plugins/languages/sniprun.nix

@@ -56,7 +56,7 @@ in {
         helpers.defaultNullOpts.mkNullable (types.listOf types.str) ''["VirtualTextOk"]''
         "Display modes used in live_mode";
 
-      displayOptions = helpers.mkCompositeOption "Display options" {
+      displayOptions = {
         terminalWidth =
           helpers.defaultNullOpts.mkInt 45
           "Change the terminal display option width.";
@@ -77,42 +77,37 @@ in {
           bg ? "",
           ctermbg ? "",
           ctermfg ? "",
-        }:
-          helpers.mkCompositeOption "" {
-            bg = helpers.defaultNullOpts.mkStr fg "Background color";
-            fg = helpers.defaultNullOpts.mkStr bg "Foreground color";
-            ctermbg = helpers.defaultNullOpts.mkStr ctermbg "Foreground color";
-            ctermfg = helpers.defaultNullOpts.mkStr ctermfg "Foreground color";
-          };
+        }: {
+          bg = helpers.defaultNullOpts.mkStr fg "Background color";
+          fg = helpers.defaultNullOpts.mkStr bg "Foreground color";
+          ctermbg = helpers.defaultNullOpts.mkStr ctermbg "Foreground color";
+          ctermfg = helpers.defaultNullOpts.mkStr ctermfg "Foreground color";
+        };
       in
-        helpers.mkCompositeOption
-        "Customize highlight groups (setting this overrides colorscheme)"
-        (
-          mapAttrs
-          (optionName: colorOption)
-          {
-            SniprunVirtualTextOk = {
-              bg = "#66eeff";
-              fg = "#000000";
-              ctermbg = "Cyan";
-              ctermfg = "Black";
-            };
-            SniprunFloatingWinOk = {
-              fg = "#66eeff";
-              ctermfg = "Cyan";
-            };
-            SniprunVirtualTextErr = {
-              bg = "#881515";
-              fg = "#000000";
-              ctermbg = "DarkRed";
-              ctermfg = "Black";
-            };
-            SniprunFloatingWinErr = {
-              fg = "#881515";
-              ctermfg = "DarkRed";
-            };
-          }
-        );
+        mapAttrs
+        (optionName: colorOption)
+        {
+          SniprunVirtualTextOk = {
+            bg = "#66eeff";
+            fg = "#000000";
+            ctermbg = "Cyan";
+            ctermfg = "Black";
+          };
+          SniprunFloatingWinOk = {
+            fg = "#66eeff";
+            ctermfg = "Cyan";
+          };
+          SniprunVirtualTextErr = {
+            bg = "#881515";
+            fg = "#000000";
+            ctermbg = "DarkRed";
+            ctermfg = "Black";
+          };
+          SniprunFloatingWinErr = {
+            fg = "#881515";
+            ctermfg = "DarkRed";
+          };
+        };
 
       liveModeToggle =
         helpers.defaultNullOpts.mkStr "off"
@@ -144,11 +139,10 @@ in {
           interpreter_options = cfg.interpreterOptions;
           inherit (cfg) display;
           live_display = cfg.liveDisplay;
-          display_options = with cfg.displayOptions;
-            helpers.ifNonNull' cfg.displayOptions {
-              terminal_width = terminalWidth;
-              notification_timeout = notificationTimeout;
-            };
+          display_options = with cfg.displayOptions; {
+            terminal_width = terminalWidth;
+            notification_timeout = notificationTimeout;
+          };
           show_no_output = cfg.showNoOutput;
           inherit (cfg) snipruncolors;
           live_mode_toggle = cfg.liveModeToggle;