host/rootfs: remove duplicate extfs definition

And move to shell.nix — it's just needed here for testing.

2 files changed, 1 insertions, 31 deletions

diff --git a/host/rootfs/default.nix b/host/rootfs/default.nix
index 90f2e7c..b9fabee 100644
--- a/host/rootfs/default.nix
+++ b/host/rootfs/default.nix
@@ -72,36 +72,6 @@ let
     tar -cf $out --sort=name --mtime=@0 --verbatim-files-from \
         -T ${writeReferencesToFile packagesSysroot} .
   '';
-
-  netvm = import ../../vm/sys/net {
-    inherit pkgs;
-    inherit (foot) terminfo;
-  };
-
-  appvm-catgirl = import ../../vm/app/catgirl {
-    inherit pkgs;
-    inherit (foot) terminfo;
-  };
-
-  appvm-lynx = import ../../vm/app/lynx {
-    inherit pkgs;
-    inherit (foot) terminfo;
-  };
-
-  extFs = runCommand "ext.ext4" {
-    nativeBuildInputs = [ tar2ext4 s6-rc ];
-  } ''
-    mkdir svc
-
-    tar -C ${netvm} -c data | tar -C svc -x
-    chmod +w svc/data
-    tar -C ${appvm-catgirl} -c data | tar -C svc -x
-    chmod +w svc/data
-    tar -C ${appvm-lynx} -c data | tar -C svc -x
-
-    tar -cf ext.tar svc
-    tar2ext4 -i ext.tar -o $out
-  '';
 in
 
 stdenv.mkDerivation {
@@ -114,7 +84,6 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ s6-rc tar2ext4 ];
 
-  EXT_FS = extFs;
   MODULES_ALIAS = "${kernel}/lib/modules/${kernel.modDirVersion}/modules.alias";
   MODULES_ORDER = "${kernel}/lib/modules/${kernel.modDirVersion}/modules.order";
   PACKAGES_TAR = packagesTar;
diff --git a/host/rootfs/shell.nix b/host/rootfs/shell.nix
index bafe2c8..6146337 100644
--- a/host/rootfs/shell.nix
+++ b/host/rootfs/shell.nix
@@ -13,5 +13,6 @@ with pkgs;
     jq netcat qemu_kvm reuse screen util-linux
   ];
 
+  EXT_FS = pkgsStatic.callPackage ../initramfs/extfs.nix { inherit pkgs; };
   KERNEL = "${passthru.kernel}/${stdenv.hostPlatform.linux-kernel.target}";
 })