--- host/initramfs/extfs.nix | 6 +++--- host/initramfs/live.nix | 2 +- host/rootfs/default.nix | 6 +++--- installer/default.nix | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/host/initramfs/extfs.nix b/host/initramfs/extfs.nix index b26f6e1..c50df21 100644 --- a/host/initramfs/extfs.nix +++ b/host/initramfs/extfs.nix @@ -1,17 +1,17 @@ { pkgs, runCommand, s6-rc, tar2ext4 }: let - netvm = import ../spectrum-netvm { + netvm = import ../../vm/sys/net { inherit pkgs; # inherit (foot) terminfo; }; - appvm-catgirl = import ../spectrum-appvm-catgirl { + appvm-catgirl = import ../../vm/app/catgirl { inherit pkgs; # inherit (foot) terminfo; }; - appvm-lynx = import ../spectrum-appvm-lynx { + appvm-lynx = import ../../vm/app/lynx { inherit pkgs; # inherit (foot) terminfo; }; diff --git a/host/initramfs/live.nix b/host/initramfs/live.nix index 27d868b..6446593 100644 --- a/host/initramfs/live.nix +++ b/host/initramfs/live.nix @@ -6,7 +6,7 @@ let initramfs = callPackage ./. { }; - host-rootfs = import ../spectrum-rootfs { inherit pkgs; }; + host-rootfs = import ../rootfs { inherit pkgs; }; extfs = pkgsStatic.callPackage ./extfs.nix { inherit pkgs; }; kernelTarget = stdenv.hostPlatform.linux-kernel.target; diff --git a/host/rootfs/default.nix b/host/rootfs/default.nix index fc347aa..21a9818 100644 --- a/host/rootfs/default.nix +++ b/host/rootfs/default.nix @@ -62,17 +62,17 @@ let -T ${writeReferencesToFile packagesSysroot} . ''; - netvm = import ../spectrum-netvm { + netvm = import ../../vm/sys/net { inherit pkgs; inherit (foot) terminfo; }; - appvm-catgirl = import ../spectrum-appvm-catgirl { + appvm-catgirl = import ../../vm/app/catgirl { inherit pkgs; inherit (foot) terminfo; }; - appvm-lynx = import ../spectrum-appvm-lynx { + appvm-lynx = import ../../vm/app/lynx { inherit pkgs; inherit (foot) terminfo; }; diff --git a/installer/default.nix b/installer/default.nix index 183a962..0685bdd 100644 --- a/installer/default.nix +++ b/installer/default.nix @@ -8,7 +8,7 @@ let inherit (pkgs.lib) removePrefix; inherit (nixos ./configuration.nix) config; - image = import ../spectrum-initramfs/live.nix { inherit pkgs; }; + image = import ../host/initramfs/live.nix { inherit pkgs; }; grub = grub2_efi; -- 2.34.0