NotAShelf/nvf
1
0
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2024-11-26 15:06:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

modules/plugins: move plugins/ui to neovim/global/ui

Browse source
This commit is contained in:
raf 2024-05-01 21:46:42 +03:00
parent f0f2c08e9f
commit 0e84e4ebed
No known key found for this signature in database
GPG key ID: 02D1DD3FA08B6B29
5 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
modules/modules.nix
View file

@ -10,6 +10,7 @@
# Contains configuration for core neovim features # Contains configuration for core neovim features
# such as spellchecking, mappings, and the init script (init.vim). # such as spellchecking, mappings, and the init script (init.vim).
neovim = map (p: ./neovim + "/${p}") [ neovim = map (p: ./neovim + "/${p}") [
"global"
"init" "init"
"mappings" "mappings"
]; ];

6
modules/neovim/global/default.nix Normal file
View file

@ -0,0 +1,6 @@
{lib}: {
imports = lib.concatLists [
# Configuration options for Neovim UI
(lib.filesystem.listFilesRecursive ./ui)
];
}

21
modules/plugins/ui/borders/borders.nix → modules/neovim/global/ui/borders.nix
View file

@ -4,6 +4,7 @@
... ...
}: let }: let
inherit (lib.options) mkOption mkEnableOption; inherit (lib.options) mkOption mkEnableOption;
inherit (lib.attrsets) mapAttrs;
inherit (lib.lists) optionals; inherit (lib.lists) optionals;
inherit (lib.types) enum; inherit (lib.types) enum;
@ -22,7 +23,6 @@ in {
''; '';
}; };
# TODO: make per-plugin borders configurable
plugins = let plugins = let
mkPluginStyleOption = name: { mkPluginStyleOption = name: {
enable = mkEnableOption "borders for the ${name} plugin" // {default = cfg.enable;}; enable = mkEnableOption "borders for the ${name} plugin" // {default = cfg.enable;};
@ -33,14 +33,15 @@ in {
description = "The border style to use for the ${name} plugin"; description = "The border style to use for the ${name} plugin";
}; };
}; };
in { in
# despite not having it listed in example configuration, which-key does support the rounded type mapAttrs (_: mkPluginStyleOption) {
# additionally, it supports a "shadow" type that is similar to none but is of higher contrast # despite not having it listed in example configuration, which-key does support the rounded type
which-key = mkPluginStyleOption "which-key"; # additionally, it supports a "shadow" type that is similar to none but is of higher contrast
lspsaga = mkPluginStyleOption "lspsaga"; which-key = mkPluginStyleOption "which-key";
nvim-cmp = mkPluginStyleOption "nvim-cmp"; lspsaga = mkPluginStyleOption "lspsaga";
lsp-signature = mkPluginStyleOption "lsp-signature"; nvim-cmp = mkPluginStyleOption "nvim-cmp";
code-action-menu = mkPluginStyleOption "code-actions-menu"; lsp-signature = mkPluginStyleOption "lsp-signature";
}; code-action-menu = mkPluginStyleOption "code-actions-menu";
};
}; };
} }

5
modules/plugins/ui/borders/default.nix
View file

@ -1,5 +0,0 @@
{
imports = [
./borders.nix
];
}

10
modules/plugins/ui/default.nix
View file

@ -1,12 +1,10 @@
{ {
imports = [ imports = [
./noice ./breadcumbs
./modes
./notifications
./smartcolumn
./colorizer ./colorizer
./illuminate ./illuminate
./breadcrumbs ./noice
./borders ./notifications
./smartcolumn
]; ];
} }