lbailly/liminix
1
0
Fork 0
forked from DGNum/liminix
Code Pull requests 2 Activity Actions

rename config.environment as config.filesystem

Browse source
This commit is contained in:
Daniel Barlow 2022-09-27 16:33:58 +01:00
parent 696bbe6521
commit 5d10a9e760
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/base.nix
View file

@ -22,7 +22,7 @@ in {
services = mkOption { services = mkOption {
type = types.attrsOf type_service; type = types.attrsOf type_service;
}; };
environment = mkOption { type = types.anything; }; filesystem = mkOption { type = types.anything; };
kernel = { kernel = {
config = mkOption { config = mkOption {
# mostly the values are y n or m, but sometimes # mostly the values are y n or m, but sometimes
@ -37,7 +37,7 @@ in {
config = { config = {
defaultProfile.packages = with pkgs; defaultProfile.packages = with pkgs;
[ s6-init-bin busybox execline s6-linux-init s6-rc ]; [ s6-init-bin busybox execline s6-linux-init s6-rc ];
environment = dir { filesystem = dir {
bin = dir { bin = dir {
sh = symlink "${busybox}/bin/sh"; sh = symlink "${busybox}/bin/sh";
busybox = symlink "${busybox}/bin/busybox"; busybox = symlink "${busybox}/bin/busybox";

2
modules/s6/default.nix
View file

@ -134,7 +134,7 @@ let
}; };
in { in {
config = { config = {
environment = dir { filesystem = dir {
etc = dir { etc = dir {
s6-rc = dir { s6-rc = dir {
compiled = symlink "${s6-rc-db}/compiled"; compiled = symlink "${s6-rc-db}/compiled";

4
pkgs/liminix-tools/builders/squashfs.nix
View file

@ -9,12 +9,12 @@
} : config : } : config :
let let
pseudofiles = pseudofiles =
pseudofile.write "config.etc" (config.environment.contents); pseudofile.write "files.pf" (config.filesystem.contents);
storefs = callPackage <nixpkgs/nixos/lib/make-squashfs.nix> { storefs = callPackage <nixpkgs/nixos/lib/make-squashfs.nix> {
# 1) Every required package is referenced from somewhere # 1) Every required package is referenced from somewhere
# outside /nix/store. 2) Every file outside the store is # 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 # the pseudofile will give us all the needed packages
storeContents = [ pseudofiles ]; storeContents = [ pseudofiles ];
}; };