From 575b4759883fd186023e824d328ea76daf4a777d Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Mon, 19 Feb 2024 12:24:03 -0600 Subject: [PATCH] no need to use path in flake.nix --- flake.nix | 3 +-- lib/default.nix | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 0aa137b..dcc6114 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,6 @@ { description = "nix begat oizys"; - inputs.inputs.url = "github:daylinmorgan/oizys?dir=inputs"; outputs = { @@ -16,7 +15,7 @@ }; inherit (lib) findModules buildHosts buildOizys; in { - nixosModules = findModules ./modules; + nixosModules = findModules {}; nixosConfigurations = buildHosts {}; packages = buildOizys {}; }; diff --git a/lib/default.nix b/lib/default.nix index d2b269b..02793b4 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -47,7 +47,7 @@ in rec { mapHosts = dir: mapAttrs (name: _: mkSystem name) (readDir dir); buildHosts = _: mapHosts ../hosts; - findModules = modulesPath: listToAttrs (findModulesList modulesPath); + findModules = _: listToAttrs (findModulesList ../modules); # https://github.com/balsoft/nixos-config/blob/73cc2c3a8bb62a9c3980a16ae70b2e97af6e1abd/flake.nix#L109-L120 findModulesList = dir: concatLists (attrValues (mapAttrs