NotAShelf/nvf
1
0
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2024-11-22 21:30:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib: extract shared borderType

Browse source
This commit is contained in:
Pei Yang Ching 2024-07-16 13:56:48 +02:00
parent d3cd9809b2
commit 32eb9c3de6
5 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/types/default.nix
View file

@ -9,7 +9,7 @@
typesCustom = import ./custom.nix {inherit lib;};
in {
inherit (typesDag) dagOf;
inherit (typesPlugin) pluginsOpt extraPluginType mkPluginSetupOption luaInline pluginType;
inherit (typesPlugin) pluginsOpt extraPluginType mkPluginSetupOption luaInline pluginType borderType;
inherit (typesLanguage) diagnostics mkGrammarOption;
inherit (typesCustom) anythingConcatLists char;
}

4
lib/types/plugins.nix
View file

@ -51,9 +51,13 @@
};
};
};
borderPresets = ["none" "single" "double" "rounded" "solid" "shadow"];
in {
inherit extraPluginType fromInputs pluginType;
borderType = either (enum borderPresets) (listOf str);
pluginsOpt = {
description,
example,

14
modules/plugins/ui/borders/borders.nix
View file

@ -4,22 +4,24 @@
...
}: let
inherit (lib.options) mkOption mkEnableOption;
inherit (lib.lists) optionals;
inherit (lib.types) enum either listOf str;
inherit (lib.nvim.types) borderType;
cfg = config.vim.ui.borders;
defaultStyles = ["none" "single" "double" "rounded"];
in {
options.vim.ui.borders = {
enable = mkEnableOption "visible borders for most windows";
globalStyle = mkOption {
type = either (enum defaultStyles) (listOf str);
type = borderType;
default = "rounded";
description = ''
The global border style to use.
If a list is given, it should have a length of eight or any divisor of
eight. The array will specify the eight chars building up the border in
a clockwise fashion starting with the top-left corner.
'';
example = ["╔" "═" "╗" "║" "╝" "═" "╚" "║"];
};
# TODO: make per-plugin borders configurable
@ -28,7 +30,7 @@ in {
enable = mkEnableOption "borders for the ${name} plugin" // {default = cfg.enable;};
style = mkOption {
type = either (enum (defaultStyles ++ optionals (name != "which-key") ["shadow"])) (listOf str);
type = borderType;
default = cfg.globalStyle;
description = "The border style to use for the ${name} plugin";
};

14
modules/plugins/ui/breadcrumbs/breadcrumbs.nix
View file

@ -6,7 +6,7 @@
inherit (lib.options) mkOption mkEnableOption;
inherit (lib.types) nullOr listOf enum bool str int either;
inherit (lib.modules) mkRenamedOptionModule;
inherit (lib.nvim.types) mkPluginSetupOption;
inherit (lib.nvim.types) mkPluginSetupOption borderType;
mkSimpleIconOption = default:
mkOption {
inherit default;
@ -212,8 +212,7 @@ in {
# position = {}
border = mkOption {
# TODO: let this type accept a custom string
type = either (enum ["single" "rounded" "double" "solid" "none"]) (listOf str);
type = borderType;
default = config.vim.ui.borders.globalStyle;
description = "border style to use";
};
@ -236,8 +235,7 @@ in {
*/
border = mkOption {
# TODO: let this type accept a custom string
type = nullOr (either (enum ["single" "rounded" "double" "solid" "none"]) (listOf str));
type = borderType;
default = config.vim.ui.borders.globalStyle;
description = "border style to use for the left section of Navbuddy UI";
};
@ -254,8 +252,7 @@ in {
*/
border = mkOption {
# TODO: let this type accept a custom string
type = nullOr (either (enum ["single" "rounded" "double" "solid" "none"]) (listOf str));
type = borderType;
default = config.vim.ui.borders.globalStyle;
description = "border style to use for the middle section of Navbuddy UI";
};
@ -265,8 +262,7 @@ in {
# there is no size option for the right section, it fills the remaining space
right = {
border = mkOption {
# TODO: let this type accept a custom string
type = nullOr (either (enum ["single" "rounded" "double" "solid" "none"]) (listOf str));
type = borderType;
default = config.vim.ui.borders.globalStyle;
description = "border style to use for the right section of Navbuddy UI";
};

6
modules/plugins/visuals/fidget/fidget.nix
View file

@ -6,8 +6,8 @@
inherit (lib.modules) mkRemovedOptionModule mkRenamedOptionModule;
inherit (lib.options) mkEnableOption mkOption literalExpression;
inherit (lib.strings) toUpper;
inherit (lib.types) int float bool str enum listOf attrsOf oneOf nullOr submodule either;
inherit (lib.nvim.types) mkPluginSetupOption luaInline;
inherit (lib.types) int float bool str enum listOf attrsOf oneOf nullOr submodule;
inherit (lib.nvim.types) mkPluginSetupOption luaInline borderType;
inherit (lib.generators) mkLuaInline;
in {
imports = [
@ -453,7 +453,7 @@ in {
};
border = mkOption {
description = "Border style of the notification window";
type = either (enum ["none" "single" "double" "rounded" "solid" "shadow"]) (listOf str);
type = borderType;
default =
if config.vim.ui.borders.enable
then config.vim.ui.borders.globalStyle