diff options
| author | Alejandro Soto <alejandro@34project.org> | 2022-08-25 19:51:25 -0600 |
|---|---|---|
| committer | Alejandro Soto <alejandro@34project.org> | 2022-08-25 20:11:37 -0600 |
| commit | 8ca522c80bcf3ccff385906039167b0906cda63c (patch) | |
| tree | c68d44b7eba9e705d718881a5374a6b50965bdcf | |
| parent | 222125ca5960398a4f5e5580dfc66893ddb676ea (diff) | |
home/isolation: use modulesUnder instead of manual import
Diffstat (limited to '')
| -rw-r--r-- | flake.nix | 5 | ||||
| -rw-r--r-- | home/isolation.nix | 2 | ||||
| -rw-r--r-- | pkgs/default.nix | 2 | ||||
| -rw-r--r-- | util/importAll.nix | 5 |
4 files changed, 6 insertions, 8 deletions
@@ -20,10 +20,7 @@ util = import ./util; inherit (util nixpkgs.lib) importAll; - pkgSet = pkgs: import ./pkgs { - inherit pkgs; - util = util pkgs.lib; - }; + pkgSet = pkgs: import ./pkgs pkgs; in { packages."x86_64-linux" = pkgSet nixpkgs.legacyPackages."x86_64-linux"; diff --git a/home/isolation.nix b/home/isolation.nix index 276d0d8..5a15468 100644 --- a/home/isolation.nix +++ b/home/isolation.nix @@ -14,6 +14,6 @@ with lib; { }; }; - modules = import ../util/importAll.nix lib { root = ./shenvs; }; + modulesUnder = ./shenvs; }; } diff --git a/pkgs/default.nix b/pkgs/default.nix index ae36807..21d9686 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,4 +1,4 @@ -{ pkgs, util }: +pkgs: with pkgs.lib; let inherit (pkgs) buildEnv callPackage writeTextDir; diff --git a/util/importAll.nix b/util/importAll.nix index 8062682..678cf06 100644 --- a/util/importAll.nix +++ b/util/importAll.nix @@ -11,6 +11,7 @@ let entry = name: _: { name = basename name; - value = root + "/${name}"; + value = import (root + "/${name}"); }; -in mapAttrs' entry (filterAttrs isMatch (readDir root)) +in + mapAttrs' entry (filterAttrs isMatch (readDir root)) |