Skip to content

Commit eca65ae

Browse files
committed
chore: fmway-lib changes
1 parent 8e65234 commit eca65ae

File tree

2 files changed

+37
-92
lines changed

2 files changed

+37
-92
lines changed

flake.lock

Lines changed: 32 additions & 78 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,11 @@
1616
inherit (fmway-lib) lib;
1717
in lib.mkFlake {
1818
inherit inputs;
19-
specialArgs.lib = lib.optionals (lib.pathIsRegularFile ./lib/default.nix) [
20-
(self: super: lib.fmway.doImport ./lib { lib = self; inherit inputs; })
21-
];
19+
src = ./.;
2220
} {
23-
imports = let
24-
top-level = lib.fmway.genImportsWithDefault ./top-level;
25-
modules = { self, config, lib, ... } @v: {
26-
flake = lib.fmway.genModules ./modules v;
27-
};
28-
in lib.optionals (lib.pathIsDirectory ./top-level) top-level
29-
++ lib.optionals (lib.pathIsDirectory ./modules) [ modules ]
30-
++ [
31-
# expose lib to flake outputs
32-
({ lib, ... }: { flake = { inherit lib; }; })
33-
];
21+
imports = [
22+
# expose lib to flake outputs
23+
({ lib, ... }: { flake = { inherit lib; }; })
24+
];
3425
};
3526
}

0 commit comments

Comments
 (0)