diff --git a/plugins/by-name/copilot-chat/default.nix b/plugins/by-name/copilot-chat/default.nix index ee35a248..f927aca0 100644 --- a/plugins/by-name/copilot-chat/default.nix +++ b/plugins/by-name/copilot-chat/default.nix @@ -33,7 +33,7 @@ lib.nixvim.plugins.mkNeovimPlugin { GPT model to use, 'gpt-3.5-turbo' or 'gpt-4'. ''; - temperature = helpers.defaultNullOpts.mkNullableWithRaw (types.numbers.between 0.0 1.0) 0.1 '' + temperature = helpers.defaultNullOpts.mkProportion 0.1 '' GPT temperature. ''; diff --git a/plugins/by-name/copilot-lua/default.nix b/plugins/by-name/copilot-lua/default.nix index 40e7c1bf..795e40b7 100644 --- a/plugins/by-name/copilot-lua/default.nix +++ b/plugins/by-name/copilot-lua/default.nix @@ -56,7 +56,7 @@ in The panel position. ''; - ratio = helpers.defaultNullOpts.mkNullable (types.numbers.between 0.0 1.0) 0.4 '' + ratio = helpers.defaultNullOpts.mkProportion 0.4 '' The panel ratio. ''; }; diff --git a/plugins/by-name/coverage/default.nix b/plugins/by-name/coverage/default.nix index 605f001c..f430d848 100644 --- a/plugins/by-name/coverage/default.nix +++ b/plugins/by-name/coverage/default.nix @@ -183,13 +183,13 @@ in ''; summary = { - widthPercentage = - helpers.defaultNullOpts.mkNullable (types.numbers.between 0.0 1.0) 0.7 - "Width of the pop-up window."; + widthPercentage = helpers.defaultNullOpts.mkProportion 0.7 '' + Width of the pop-up window. + ''; - heightPercentage = - helpers.defaultNullOpts.mkNullable (types.numbers.between 0.0 1.0) 0.5 - "Height of the pop-up window."; + heightPercentage = helpers.defaultNullOpts.mkProportion 0.5 '' + Height of the pop-up window. + ''; borders = mapAttrs (optionName: default: helpers.defaultNullOpts.mkStr default "") { topleft = "╭"; diff --git a/plugins/by-name/fidget/default.nix b/plugins/by-name/fidget/default.nix index b31c678e..660d576c 100644 --- a/plugins/by-name/fidget/default.nix +++ b/plugins/by-name/fidget/default.nix @@ -546,9 +546,7 @@ in logger = { level = helpers.defaultNullOpts.mkLogLevel "warn" "Minimum logging level"; - floatPrecision = helpers.defaultNullOpts.mkNullable ( - with types; numbers.between 0.0 1.0 - ) 1.0e-2 "Limit the number of decimals displayed for floats."; + floatPrecision = helpers.defaultNullOpts.mkProportion 1.0e-2 "Limit the number of decimals displayed for floats."; path = helpers.defaultNullOpts.mkStr diff --git a/plugins/by-name/lspsaga/default.nix b/plugins/by-name/lspsaga/default.nix index ca99307a..3e88acf6 100644 --- a/plugins/by-name/lspsaga/default.nix +++ b/plugins/by-name/lspsaga/default.nix @@ -86,11 +86,11 @@ in }; hover = { - maxWidth = helpers.defaultNullOpts.mkNullable (types.numbers.between 0.0 1.0) 0.9 '' + maxWidth = helpers.defaultNullOpts.mkProportion 0.9 '' Defines float window width. ''; - maxHeight = helpers.defaultNullOpts.mkNullable (types.numbers.between 0.0 1.0) 0.8 '' + maxHeight = helpers.defaultNullOpts.mkProportion 0.8 '' Defines float window height. ''; @@ -117,19 +117,19 @@ in Enable number shortcuts to execute code action quickly. ''; - maxWidth = helpers.defaultNullOpts.mkNullable (types.numbers.between 0.0 1.0) 0.8 '' + maxWidth = helpers.defaultNullOpts.mkProportion 0.8 '' Diagnostic jump window max width. ''; - maxHeight = helpers.defaultNullOpts.mkNullable (types.numbers.between 0.0 1.0) 0.6 '' + maxHeight = helpers.defaultNullOpts.mkProportion 0.6 '' Diagnostic jump window max height. ''; - maxShowWidth = helpers.defaultNullOpts.mkNullable (types.numbers.between 0.0 1.0) 0.9 '' + maxShowWidth = helpers.defaultNullOpts.mkProportion 0.9 '' Show window max width when layout is float. ''; - maxShowHeight = helpers.defaultNullOpts.mkNullable (types.numbers.between 0.0 1.0) 0.6 '' + maxShowHeight = helpers.defaultNullOpts.mkProportion 0.6 '' Show window max height when layout is float. ''; @@ -211,15 +211,15 @@ in }; finder = { - maxHeight = helpers.defaultNullOpts.mkNullable (types.numbers.between 0.0 1.0) 0.5 '' + maxHeight = helpers.defaultNullOpts.mkProportion 0.5 '' `max_height` of the finder window (float layout). ''; - leftWidth = helpers.defaultNullOpts.mkNullable (types.numbers.between 0.0 1.0) 0.3 '' + leftWidth = helpers.defaultNullOpts.mkProportion 0.3 '' Width of the left finder window (float layout). ''; - rightWidth = helpers.defaultNullOpts.mkNullable (types.numbers.between 0.0 1.0) 0.3 '' + rightWidth = helpers.defaultNullOpts.mkProportion 0.3 '' Width of the right finder window (float layout). ''; @@ -279,11 +279,11 @@ in }; definition = { - width = helpers.defaultNullOpts.mkNullable (types.numbers.between 0.0 1.0) 0.6 '' + width = helpers.defaultNullOpts.mkProportion 0.6 '' Defines float window width. ''; - height = helpers.defaultNullOpts.mkNullable (types.numbers.between 0.0 1.0) 0.5 '' + height = helpers.defaultNullOpts.mkProportion 0.5 '' Defines float window height. ''; @@ -317,13 +317,9 @@ in Auto save file when the rename is done. ''; - projectMaxWidth = - helpers.defaultNullOpts.mkNullable (types.numbers.between 0.0 1.0) 0.5 - "Width for the `project_replace` float window."; + projectMaxWidth = helpers.defaultNullOpts.mkProportion 0.5 "Width for the `project_replace` float window."; - projectMaxHeight = - helpers.defaultNullOpts.mkNullable (types.numbers.between 0.0 1.0) 0.5 - "Height for the `project_replace` float window."; + projectMaxHeight = helpers.defaultNullOpts.mkProportion 0.5 "Height for the `project_replace` float window."; keys = { quit = mkKeymapOption "" "Quit rename window or `project_replace` window."; @@ -383,11 +379,11 @@ in If set to float, above options will ignored. ''; - maxHeight = helpers.defaultNullOpts.mkNullable (types.numbers.between 0.0 1.0) 0.5 '' + maxHeight = helpers.defaultNullOpts.mkProportion 0.5 '' Height of outline float layout. ''; - leftWidth = helpers.defaultNullOpts.mkNullable (types.numbers.between 0.0 1.0) 0.3 '' + leftWidth = helpers.defaultNullOpts.mkProportion 0.3 '' Width of outline float layout left window. ''; diff --git a/plugins/by-name/neotest/options.nix b/plugins/by-name/neotest/options.nix index 5838ea01..bb9bab43 100644 --- a/plugins/by-name/neotest/options.nix +++ b/plugins/by-name/neotest/options.nix @@ -96,11 +96,11 @@ in floating = { border = defaultNullOpts.mkStr "rounded" "Border style."; - max_height = defaultNullOpts.mkNullable (types.numbers.between 0.0 1.0) 0.6 '' + max_height = defaultNullOpts.mkProportion 0.6 '' Max height of window as proportion of NeoVim window. ''; - max_width = defaultNullOpts.mkNullable (types.numbers.between 0.0 1.0) 0.6 '' + max_width = defaultNullOpts.mkProportion 0.6 '' Max width of window as proportion of NeoVim window. ''; diff --git a/plugins/by-name/twilight/default.nix b/plugins/by-name/twilight/default.nix index 47796294..0cf897cd 100644 --- a/plugins/by-name/twilight/default.nix +++ b/plugins/by-name/twilight/default.nix @@ -14,7 +14,7 @@ lib.nixvim.plugins.mkNeovimPlugin { settingsOptions = { dimming = { - alpha = helpers.defaultNullOpts.mkNullable (types.numbers.between 0.0 1.0) 0.25 '' + alpha = helpers.defaultNullOpts.mkProportion 0.25 '' Amount of dimming. ''; diff --git a/plugins/by-name/zen-mode/default.nix b/plugins/by-name/zen-mode/default.nix index 293a50c3..59f0865a 100644 --- a/plugins/by-name/zen-mode/default.nix +++ b/plugins/by-name/zen-mode/default.nix @@ -14,7 +14,7 @@ lib.nixvim.plugins.mkNeovimPlugin { # Optionally, explicitly declare some options. You don't have to. settingsOptions = { window = { - backdrop = helpers.defaultNullOpts.mkNullable (types.numbers.between 0.0 1.0) 0.95 '' + backdrop = helpers.defaultNullOpts.mkProportion 0.95 '' Shade the backdrop of the Zen window. Set to 1 to keep the same as Normal. ''; diff --git a/plugins/colorschemes/catppuccin.nix b/plugins/colorschemes/catppuccin.nix index a6b581f2..e9f8808d 100644 --- a/plugins/colorschemes/catppuccin.nix +++ b/plugins/colorschemes/catppuccin.nix @@ -164,7 +164,7 @@ lib.nixvim.plugins.mkNeovimPlugin { Sets the shade to apply to the inactive split or window or buffer. ''; - percentage = defaultNullOpts.mkNullable (types.numbers.between 0.0 1.0) 0.15 '' + percentage = defaultNullOpts.mkProportion 0.15 '' percentage of the shade to apply to the inactive window, split or buffer. ''; }; diff --git a/plugins/colorschemes/nightfox.nix b/plugins/colorschemes/nightfox.nix index b8c542ae..b18012d8 100644 --- a/plugins/colorschemes/nightfox.nix +++ b/plugins/colorschemes/nightfox.nix @@ -133,7 +133,7 @@ lib.nixvim.plugins.mkNeovimPlugin { lib.mapAttrs ( name: color: - defaultNullOpts.mkNullable (types.numbers.between 0.0 1.0) 0 '' + defaultNullOpts.mkProportion 0 '' Severity [0, 1] for ${name} (${color}). '' ) diff --git a/plugins/colorschemes/tokyonight.nix b/plugins/colorschemes/tokyonight.nix index 5128f925..70cdbbe0 100644 --- a/plugins/colorschemes/tokyonight.nix +++ b/plugins/colorschemes/tokyonight.nix @@ -118,7 +118,7 @@ lib.nixvim.plugins.mkNeovimPlugin { Set a darker background on sidebar-like windows. ''; - day_brightness = defaultNullOpts.mkNullable (lib.types.numbers.between 0.0 1.0) 0.3 '' + day_brightness = defaultNullOpts.mkProportion 0.3 '' Adjusts the brightness of the colors of the **Day** style. Number between 0 and 1, from dull to vibrant colors. '';