From 5d10a9e76023356c437e6b40d500946d94737102 Mon Sep 17 00:00:00 2001
From: Daniel Barlow <dan@telent.net>
Date: Tue, 27 Sep 2022 16:33:58 +0100
Subject: [PATCH] rename config.environment as config.filesystem

---
 modules/base.nix                         | 4 ++--
 modules/s6/default.nix                   | 2 +-
 pkgs/liminix-tools/builders/squashfs.nix | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/base.nix b/modules/base.nix
index 807ff913..e3d7f2e1 100644
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -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";
diff --git a/modules/s6/default.nix b/modules/s6/default.nix
index 9feeed51..0262ac24 100644
--- a/modules/s6/default.nix
+++ b/modules/s6/default.nix
@@ -134,7 +134,7 @@ let
   };
 in {
   config = {
-    environment = dir {
+    filesystem = dir {
       etc = dir {
         s6-rc = dir {
           compiled = symlink "${s6-rc-db}/compiled";
diff --git a/pkgs/liminix-tools/builders/squashfs.nix b/pkgs/liminix-tools/builders/squashfs.nix
index b88fd528..2833db1f 100644
--- a/pkgs/liminix-tools/builders/squashfs.nix
+++ b/pkgs/liminix-tools/builders/squashfs.nix
@@ -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 ];
   };