raf
/
neovim-flake
mirror of https://github.com/NotAShelf/neovim-flake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ui: allow custom listOf str border type

This commit is contained in:
Pei Yang Ching 2024-07-16 11:12:01 +02:00
parent 0f17147d52
commit d3cd9809b2
6 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/plugins/lsp/lspconfig/config.nix
View File

@ -7,6 +7,7 @@
inherit (lib.strings) optionalString;
inherit (lib.attrsets) mapAttrs;
inherit (lib.nvim.dag) entryAfter;
inherit (lib.nvim.lua) toLuaObject;
cfg = config.vim.lsp;
in {
@ -22,7 +23,7 @@ in {
${
optionalString config.vim.ui.borders.enable ''
require('lspconfig.ui.windows').default_options.border = '${config.vim.ui.borders.globalStyle}'
require('lspconfig.ui.windows').default_options.border = ${toLuaObject config.vim.ui.borders.globalStyle}
''
}
'';

3
modules/plugins/lsp/nvim-code-action-menu/config.nix
View File

@ -6,6 +6,7 @@
inherit (lib.modules) mkIf;
inherit (lib.nvim.dag) entryAnywhere;
inherit (lib.nvim.binds) mkSetBinding addDescriptionsToMappings pushDownDefault;
inherit (lib.nvim.lua) toLuaObject;
cfg = config.vim.lsp;
@ -25,7 +26,7 @@ in {
luaConfigRC.code-action-menu = entryAnywhere ''
-- border configuration
vim.g.code_action_menu_window_border = '${config.vim.ui.borders.plugins.code-action-menu.style}'
vim.g.code_action_menu_window_border = ${toLuaObject config.vim.ui.borders.plugins.code-action-menu.style}
-- show individual sections of the code action menu
${lib.optionalString cfg.nvimCodeActionMenu.show.details "vim.g.code_action_menu_show_details = true"}

6
modules/plugins/ui/borders/borders.nix
View File

@ -5,7 +5,7 @@
}: let
inherit (lib.options) mkOption mkEnableOption;
inherit (lib.lists) optionals;
inherit (lib.types) enum;
inherit (lib.types) enum either listOf str;
cfg = config.vim.ui.borders;
@ -15,7 +15,7 @@ in {
enable = mkEnableOption "visible borders for most windows";
globalStyle = mkOption {
type = enum defaultStyles;
type = either (enum defaultStyles) (listOf str);
default = "rounded";
description = ''
The global border style to use.
@ -28,7 +28,7 @@ in {
enable = mkEnableOption "borders for the ${name} plugin" // {default = cfg.enable;};
style = mkOption {
type = enum (defaultStyles ++ optionals (name != "which-key") ["shadow"]);
type = either (enum (defaultStyles ++ optionals (name != "which-key") ["shadow"])) (listOf str);
default = cfg.globalStyle;
description = "The border style to use for the ${name} plugin";
};

10
modules/plugins/ui/breadcrumbs/breadcrumbs.nix
View File

@ -4,7 +4,7 @@
...
}: let
inherit (lib.options) mkOption mkEnableOption;
inherit (lib.types) nullOr listOf enum bool str int;
inherit (lib.types) nullOr listOf enum bool str int either;
inherit (lib.modules) mkRenamedOptionModule;
inherit (lib.nvim.types) mkPluginSetupOption;
mkSimpleIconOption = default:
@ -213,7 +213,7 @@ in {
border = mkOption {
# TODO: let this type accept a custom string
type = enum ["single" "rounded" "double" "solid" "none"];
type = either (enum ["single" "rounded" "double" "solid" "none"]) (listOf str);
default = config.vim.ui.borders.globalStyle;
description = "border style to use";
};
@ -237,7 +237,7 @@ in {
border = mkOption {
# TODO: let this type accept a custom string
type = nullOr (enum ["single" "rounded" "double" "solid" "none"]);
type = nullOr (either (enum ["single" "rounded" "double" "solid" "none"]) (listOf str));
default = config.vim.ui.borders.globalStyle;
description = "border style to use for the left section of Navbuddy UI";
};
@ -255,7 +255,7 @@ in {
border = mkOption {
# TODO: let this type accept a custom string
type = nullOr (enum ["single" "rounded" "double" "solid" "none"]);
type = nullOr (either (enum ["single" "rounded" "double" "solid" "none"]) (listOf str));
default = config.vim.ui.borders.globalStyle;
description = "border style to use for the middle section of Navbuddy UI";
};
@ -266,7 +266,7 @@ in {
right = {
border = mkOption {
# TODO: let this type accept a custom string
type = nullOr (enum ["single" "rounded" "double" "solid" "none"]);
type = nullOr (either (enum ["single" "rounded" "double" "solid" "none"]) (listOf str));
default = config.vim.ui.borders.globalStyle;
description = "border style to use for the right section of Navbuddy UI";
};

2
modules/plugins/utility/binds/which-key/config.nix
View File

@ -25,7 +25,7 @@ in {
${optionalString config.vim.ui.borders.plugins.which-key.enable ''
window = {
border = "${config.vim.ui.borders.plugins.which-key.style}",
border = ${toLuaObject config.vim.ui.borders.plugins.which-key.style},
},
''}
})

4
modules/plugins/visuals/fidget/fidget.nix
View File

@ -6,7 +6,7 @@
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;
inherit (lib.types) int float bool str enum listOf attrsOf oneOf nullOr submodule either;
inherit (lib.nvim.types) mkPluginSetupOption luaInline;
inherit (lib.generators) mkLuaInline;
in {
@ -453,7 +453,7 @@ in {
};
border = mkOption {
description = "Border style of the notification window";
type = enum ["none" "single" "double" "rounded" "solid" "shadow"];
type = either (enum ["none" "single" "double" "rounded" "solid" "shadow"]) (listOf str);
default =
if config.vim.ui.borders.enable
then config.vim.ui.borders.globalStyle