NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-11-09 06:55:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

{lib,flake}: convert to fixed-point and modify flake for compat

Browse source
This commit is contained in:
alfarel 2025-10-16 23:18:10 +00:00
commit 1627e4dddc
No known key found for this signature in database
18 changed files with 68 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/types/custom.nix
View file

@ -1,4 +1,4 @@
{lib}: let
{lib, ...}: let
inherit (lib.options) mergeEqualOption;
inherit (lib.lists) singleton;
inherit (lib.strings) isString stringLength match;

3
lib/types/dag.nix
View file

@ -1,6 +1,7 @@
# From home-manager: https://github.com/nix-community/home-manager/blob/master/modules/lib/types-dag.nix
# Used for ordering configuration text.
{lib}: let
{lib, ...}: let
# TODO: inherit from subgroups
inherit
(lib)
defaultFunctor

13
lib/types/default.nix
View file

@ -1,11 +1,8 @@
{
lib,
self,
}: let
typesDag = import ./dag.nix {inherit lib;};
typesPlugin = import ./plugins.nix {inherit lib self;};
typesLanguage = import ./languages.nix {inherit lib;};
customTypes = import ./custom.nix {inherit lib;};
args: let
typesDag = import ./dag.nix args;
typesPlugin = import ./plugins.nix args;
typesLanguage = import ./languages.nix args;
customTypes = import ./custom.nix args;
in {
inherit (typesDag) dagOf;
inherit (typesPlugin) pluginsOpt extraPluginType mkPluginSetupOption luaInline pluginType borderType;

2
lib/types/languages.nix
View file

@ -1,4 +1,4 @@
{lib}: let
{lib, ...}: let
inherit (lib.options) mkOption mkPackageOption;
inherit (lib.attrsets) attrNames;
inherit (lib.types) listOf either enum submodule package;

9
lib/types/plugins.nix
View file

@ -1,11 +1,14 @@
{
lib,
nvf-lib,
self,
...
}: let
inherit (lib.options) mkOption;
inherit (lib.attrsets) attrNames mapAttrs' filterAttrs nameValuePair;
inherit (lib.strings) hasPrefix removePrefix;
inherit (lib.types) submodule either package enum str lines anything listOf nullOr;
inherit (lib.types) submodule either package enum str lines anything listOf nullOr mkOptionType;
inherit (nvf-lib.lua) isLuaInline;
# Get the names of all flake inputs that start with the given prefix.
fromInputs = {
@ -64,9 +67,9 @@ in {
type = pluginsType;
};
luaInline = lib.mkOptionType {
luaInline = mkOptionType {
name = "luaInline";
check = x: lib.nvim.lua.isLuaInline x;
check = x: isLuaInline x;
};
/*