rename config.environment as config.filesystem
This commit is contained in:
parent
696bbe6521
commit
5d10a9e760
3 changed files with 5 additions and 5 deletions
|
@ -22,7 +22,7 @@ in {
|
|||
services = mkOption {
|
||||
type = types.attrsOf type_service;
|
||||
};
|
||||
environment = mkOption { type = types.anything; };
|
||||
filesystem = mkOption { type = types.anything; };
|
||||
kernel = {
|
||||
config = mkOption {
|
||||
# mostly the values are y n or m, but sometimes
|
||||
|
@ -37,7 +37,7 @@ in {
|
|||
config = {
|
||||
defaultProfile.packages = with pkgs;
|
||||
[ s6-init-bin busybox execline s6-linux-init s6-rc ];
|
||||
environment = dir {
|
||||
filesystem = dir {
|
||||
bin = dir {
|
||||
sh = symlink "${busybox}/bin/sh";
|
||||
busybox = symlink "${busybox}/bin/busybox";
|
||||
|
|
|
@ -134,7 +134,7 @@ let
|
|||
};
|
||||
in {
|
||||
config = {
|
||||
environment = dir {
|
||||
filesystem = dir {
|
||||
etc = dir {
|
||||
s6-rc = dir {
|
||||
compiled = symlink "${s6-rc-db}/compiled";
|
||||
|
|
|
@ -9,12 +9,12 @@
|
|||
} : config :
|
||||
let
|
||||
pseudofiles =
|
||||
pseudofile.write "config.etc" (config.environment.contents);
|
||||
pseudofile.write "files.pf" (config.filesystem.contents);
|
||||
|
||||
storefs = callPackage <nixpkgs/nixos/lib/make-squashfs.nix> {
|
||||
# 1) Every required package is referenced from somewhere
|
||||
# outside /nix/store. 2) Every file outside the store is
|
||||
# specified by config.environment. 3) Therefore, closing over
|
||||
# specified by config.filesystem. 3) Therefore, closing over
|
||||
# the pseudofile will give us all the needed packages
|
||||
storeContents = [ pseudofiles ];
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue