diff options
| -rw-r--r-- | hosts/ades/iso.nix | 6 | ||||
| -rw-r--r-- | hosts/default.nix | 1 | ||||
| -rw-r--r-- | lib/default.nix | 4 | ||||
| -rw-r--r-- | lib/thin-shim.nix (renamed from hosts/ades/thin-shim.nix) | 0 |
4 files changed, 8 insertions, 3 deletions
diff --git a/hosts/ades/iso.nix b/hosts/ades/iso.nix index 79db210..a0bd2e5 100644 --- a/hosts/ades/iso.nix +++ b/hosts/ades/iso.nix @@ -1,4 +1,4 @@ -{ modulesPath, lib, config, pkgs, ... }: +{ modulesPath, lib, tlib, config, pkgs, ... }: let inherit (lib.attrsets) @@ -6,6 +6,8 @@ let inherit (builtins) map; + mkThinShim = tlib.mkThinShim pkgs; + shimmedPackages = [ "wesnoth" "luanti" @@ -17,8 +19,6 @@ let "taisei" "unvanquished" ]; - - mkThinShim = import ./thin-shim.nix pkgs; in rec { imports = [ diff --git a/hosts/default.nix b/hosts/default.nix index d5770c6..8ba60fb 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -9,6 +9,7 @@ let modules = [ ../modules ../users ] ++ modules; specialArgs = { inherit hostname inputs; + tlib = import ../lib { }; }; }; }; diff --git a/lib/default.nix b/lib/default.nix new file mode 100644 index 0000000..0f6f82b --- /dev/null +++ b/lib/default.nix @@ -0,0 +1,4 @@ +{ }: +{ + mkThinShim = import ./thin-shim.nix; +} diff --git a/hosts/ades/thin-shim.nix b/lib/thin-shim.nix index a9f931b..a9f931b 100644 --- a/hosts/ades/thin-shim.nix +++ b/lib/thin-shim.nix |