From de54c213eb28da915526f5ac5dc995329b664d47 Mon Sep 17 00:00:00 2001
From: Cappy Ishihara <cappy@cappuchino.xyz>
Date: Thu, 10 Oct 2024 12:57:13 +0700
Subject: [PATCH] noop out more code, proper-ish parsing?

---
 src/cfg/manifest.rs                           | 181 ------------
 src/cfg/manifest/mod.rs                       | 259 +++++++++++++++++
 src/cfg/mod.rs                                |   2 +-
 src/cfg/script.rs                             |   4 +
 src/main.rs                                   |  30 +-
 tests/main.katsu.hcl                          | 261 ++----------------
 tests/ng/.gitignore                           |   1 -
 tests/ng/katsu-arm.yaml                       |  32 ---
 tests/ng/katsu-iso-limine.yaml                |  29 --
 tests/ng/katsu-iso.yaml                       |  28 --
 tests/ng/katsu-script-test.yaml               |  12 -
 tests/ng/katsu.yaml                           |  38 ---
 tests/ng/modules/base.yaml                    |  80 ------
 tests/ng/modules/live-image/live.yaml         |  12 -
 tests/ng/modules/live-image/liveimage.sh      |   5 -
 .../repodir/fedora-cisco-openh264.repo        |  22 --
 tests/ng/modules/repodir/fedora-updates.repo  |  36 ---
 tests/ng/modules/repodir/fedora.repo          |  36 ---
 .../repodir/rpmfusion-free-tainted.repo       |  33 ---
 .../repodir/rpmfusion-free-updates.repo       |  31 ---
 tests/ng/modules/repodir/rpmfusion-free.repo  |  33 ---
 .../repodir/rpmfusion-nonfree-tainted.repo    |  33 ---
 .../repodir/rpmfusion-nonfree-updates.repo    |  31 ---
 .../ng/modules/repodir/rpmfusion-nonfree.repo |  34 ---
 tests/ng/modules/repodir/terra.repo           |  11 -
 tests/ng/modules/repodir/ultramarine.repo     |  11 -
 tests/ng/modules/scripts/grub-install.sh      |  40 ---
 tests/ng/modules/scripts/image-cleanup.sh     |  46 ---
 tests/ng/modules/scripts/pre-test2.sh         |  37 ---
 tests/ng/modules/scripts/selinux.sh           |   6 -
 tests/ng/modules/tests.yaml                   |   9 -
 tests/ng/recurse/manifest.yaml                |   9 -
 tests/ng/recurse/recurse1.yaml                |  12 -
 tests/ng/recurse/recurse2.yaml                |   8 -
 tests/pkglist.katsu.hcl                       |  13 +
 tests/{test.katsu.hcl => reference.katsu.hcl} |   9 +-
 36 files changed, 321 insertions(+), 1153 deletions(-)
 delete mode 100644 src/cfg/manifest.rs
 create mode 100644 src/cfg/manifest/mod.rs
 delete mode 100644 tests/ng/.gitignore
 delete mode 100644 tests/ng/katsu-arm.yaml
 delete mode 100644 tests/ng/katsu-iso-limine.yaml
 delete mode 100644 tests/ng/katsu-iso.yaml
 delete mode 100644 tests/ng/katsu-script-test.yaml
 delete mode 100644 tests/ng/katsu.yaml
 delete mode 100644 tests/ng/modules/base.yaml
 delete mode 100644 tests/ng/modules/live-image/live.yaml
 delete mode 100644 tests/ng/modules/live-image/liveimage.sh
 delete mode 100644 tests/ng/modules/repodir/fedora-cisco-openh264.repo
 delete mode 100644 tests/ng/modules/repodir/fedora-updates.repo
 delete mode 100644 tests/ng/modules/repodir/fedora.repo
 delete mode 100644 tests/ng/modules/repodir/rpmfusion-free-tainted.repo
 delete mode 100644 tests/ng/modules/repodir/rpmfusion-free-updates.repo
 delete mode 100644 tests/ng/modules/repodir/rpmfusion-free.repo
 delete mode 100644 tests/ng/modules/repodir/rpmfusion-nonfree-tainted.repo
 delete mode 100644 tests/ng/modules/repodir/rpmfusion-nonfree-updates.repo
 delete mode 100644 tests/ng/modules/repodir/rpmfusion-nonfree.repo
 delete mode 100644 tests/ng/modules/repodir/terra.repo
 delete mode 100644 tests/ng/modules/repodir/ultramarine.repo
 delete mode 100644 tests/ng/modules/scripts/grub-install.sh
 delete mode 100644 tests/ng/modules/scripts/image-cleanup.sh
 delete mode 100644 tests/ng/modules/scripts/pre-test2.sh
 delete mode 100644 tests/ng/modules/scripts/selinux.sh
 delete mode 100644 tests/ng/modules/tests.yaml
 delete mode 100644 tests/ng/recurse/manifest.yaml
 delete mode 100644 tests/ng/recurse/recurse1.yaml
 delete mode 100644 tests/ng/recurse/recurse2.yaml
 create mode 100644 tests/pkglist.katsu.hcl
 rename tests/{test.katsu.hcl => reference.katsu.hcl} (98%)

diff --git a/src/cfg/manifest.rs b/src/cfg/manifest.rs
deleted file mode 100644
index 7e126ab..0000000
--- a/src/cfg/manifest.rs
+++ /dev/null
@@ -1,181 +0,0 @@
-use std::{fmt::Debug, path::Path};
-
-use bytesize::ByteSize;
-use serde::{Deserialize, Serialize};
-
-use super::{partition::PartitionType, script::Script};
-
-const DEFAULT_VOLID: &str = "KATSU-LIVEOS";
-
-fn _default_volid() -> String {
-	DEFAULT_VOLID.to_owned()
-}
-
-#[derive(Deserialize, Debug, Clone, Serialize)]
-pub struct IsoConfig {
-	/// Volume ID for the ISO image
-	#[serde(default = "_default_volid")]
-	pub volume_id: String,
-}
-
-#[derive(Default, Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "kebab-case")]
-pub enum BuilderType {
-	#[default]
-	Dnf,
-}
-
-pub trait BootstrapOption: Debug + dyn_clone::DynClone {
-	fn bootstrap_system(&self) -> color_eyre::Result<()>;
-}
-
-mod bootstrap_option_serde {
-	use super::BootstrapOption;
-
-	pub fn serialize<'se, S>(
-		bootstrap_option: &Box<dyn BootstrapOption>, serializer: S,
-	) -> Result<S::Ok, S::Error>
-	where
-		S: serde::Serializer,
-	{
-		todo!()
-	}
-}
-
-dyn_clone::clone_trait_object!(BootstrapOption);
-
-// todo: rewrite everything
-#[derive(Deserialize, Debug, Clone, Serialize)]
-pub struct Manifest {
-	/// Builder type
-	#[serde(default)]
-	pub builder: BuilderType,
-	/// The distro name for the build result
-	// entrypoint must have a distro name
-	#[serde(default)]
-	pub distro: Option<String>,
-
-	/// Output file name
-	// entrypoint must have an output location
-	#[serde(default)]
-	pub out_file: Option<String>,
-
-	#[serde(default)]
-	pub disk: Option<super::partition::PartitionLayout>,
-
-	/// DNF configuration
-	// todo: dynamically load this?
-	#[serde(default)]
-	pub dnf: crate::builder::DnfRootBuilder,
-
-	/// Scripts to run before and after the build
-	#[serde(default)]
-	pub scripts: super::script::ScriptsManifest,
-
-	/// Users to add to the image
-	#[serde(default)]
-	pub users: Vec<super::auth::Auth>,
-
-	/// Extra parameters to the kernel command line in bootloader configs
-	pub kernel_cmdline: Option<String>,
-
-	/// ISO config (optional)
-	/// This is only used for ISO images
-	#[serde(default)]
-	pub iso: Option<IsoConfig>,
-
-	#[serde(default)]
-	pub bootloader: super::boot::Bootloader,
-}
-
-impl Manifest {
-	#[must_use]
-	pub fn get_volid(&self) -> &str {
-		self.iso.as_ref().map_or(DEFAULT_VOLID, |iso| &iso.volume_id)
-	}
-	/// Load manifest from file
-	///
-	/// # Errors
-	///
-	/// This function will return an error if the file cannot be read or parsed.
-	pub fn load(path: &Path) -> color_eyre::Result<Self> {
-		Ok(hcl::de::from_body(ensan::parse(std::fs::read_to_string(path)?)?)?)
-	}
-}
-
-/// Variable types used for validation in `[Var]`
-#[derive(Deserialize, Debug, Clone, Serialize)]
-pub enum VarType {
-	String,
-	Int,
-	Object,
-}
-
-#[derive(Deserialize, Debug, Clone, Serialize)]
-pub struct Var {
-	#[serde(rename = "type")]
-	pub var_type: VarType,
-	pub default: Option<hcl::Value>,
-}
-
-#[derive(Deserialize, Debug, Clone, Serialize)]
-pub enum BootstrapMethod {
-	Oci,
-	Tar,
-	Dir,
-	Squashfs,
-	Dnf,
-}
-
-#[derive(Deserialize, Debug, Clone, Serialize)]
-#[serde(rename_all = "snake_case")]
-#[serde(tag = "type")]
-pub struct PartitionLayout {
-	// pub partition: Vec<Partition>,
-}
-
-#[derive(Deserialize, Debug, Clone, Serialize)]
-pub struct Partition {
-	pub size: ByteSize,
-	pub mountpoint: String,
-	pub filesystem: String,
-	#[serde(rename = "type")]
-	pub partition_type: PartitionType,
-	pub copy_blocks: Option<String>,
-}
-
-#[derive(Deserialize, Debug, Clone, Serialize)]
-pub struct CopyFiles {
-	pub source: String,
-	pub destination: String,
-}
-
-/// A Katsu target
-///
-/// Represented by a HCL block `target`
-///
-/// ```hcl
-/// output "type" "id" {
-///     method = "oci"
-/// }
-/// ```
-// todo: evaluate dep graph for outputs, so we can build them in the correct order
-#[derive(Debug, Clone, Serialize)]
-#[serde(tag = "type")]
-// an output can be a filesystem, a container image, or a disk image.
-// It can also rely on other outputs for bootstrapping.
-pub struct Target {
-	pub id: String,
-	/// Method to bootstrap the output filesystem
-	pub method: BootstrapMethod,
-	/// Copy files from the host to the output tree before packing
-	pub copy: Vec<CopyFiles>,
-	/// Scripts to run before and after the build
-	pub script: Vec<Script>,
-
-	// bootstrapping options
-	// todo: make this some kind of enum? or a vec of generic options?
-	// Box<dyn BootstrapOption> or something...
-	#[serde(with = "bootstrap_option_serde")]
-	pub bootstrap: Box<dyn BootstrapOption>,
-}
diff --git a/src/cfg/manifest/mod.rs b/src/cfg/manifest/mod.rs
new file mode 100644
index 0000000..466e7d7
--- /dev/null
+++ b/src/cfg/manifest/mod.rs
@@ -0,0 +1,259 @@
+use std::{collections::BTreeMap, fmt::Debug, path::Path};
+
+use bytesize::ByteSize;
+use serde::{Deserialize, Serialize};
+
+use super::{
+	partition::PartitionType,
+	script::{Script, ScriptsManifest},
+};
+
+const DEFAULT_VOLID: &str = "KATSU-LIVEOS";
+
+fn _default_volid() -> String {
+	DEFAULT_VOLID.to_owned()
+}
+
+#[derive(Deserialize, Debug, Clone, Serialize)]
+pub struct IsoConfig {
+	/// Volume ID for the ISO image
+	#[serde(default = "_default_volid")]
+	pub volume_id: String,
+}
+
+#[derive(Default, Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "kebab-case")]
+pub enum BuilderType {
+	#[default]
+	Dnf,
+}
+
+pub trait BootstrapOption: Debug + dyn_clone::DynClone {
+	fn bootstrap_system(&self) -> color_eyre::Result<()>;
+}
+
+mod bootstrap_option_serde {
+	use super::BootstrapOption;
+
+	pub fn serialize<'se, S>(
+		bootstrap_option: &Box<dyn BootstrapOption>, serializer: S,
+	) -> Result<S::Ok, S::Error>
+	where
+		S: serde::Serializer,
+	{
+		todo!()
+	}
+}
+
+/// A list of Packages by architecture, used inside `pkg_list`
+///
+/// A key-value map of `"arch" -> ["package1", "package2"]`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct PackageArchList {
+	#[serde(default)]
+	#[serde(flatten)]
+	pub packages: BTreeMap<String, Vec<String>>,
+
+	#[serde(default)]
+	#[serde(rename = "exclude")]
+	pub packages_exclude: BTreeMap<String, Vec<String>>,
+}
+
+/// A list of packages.
+///
+/// A key-value list of package specs to pull in.
+///
+///
+/// ```hcl
+/// pkg_list "pkgmgr" "listname" {
+///    all = ["package1", "package2"]
+///   x86_64 = ["package3", "package4"]
+/// }
+/// ```
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+pub struct PackageList {
+	#[serde(default)]
+	#[serde(flatten)]
+	// A nested map of package lists by package manager
+	// package_manager.listname.arch = ["package1", "package2"]
+	pub package_manager: BTreeMap<String, BTreeMap<String, PackageArchList>>,
+}
+
+impl PackageList {
+	/// Resolve a package list based on the architecture, package manager, and list name.
+	///
+	/// # Parameters
+	/// - `arch`: A string slice that holds the architecture type.
+	/// - `pkgmgr`: A string slice that holds the package manager name.
+	/// - `list_name`: A string slice that holds the name of the package list.
+	///
+	/// # Returns
+	/// A vector of strings containing the resolved package names. If the package manager or list name
+	/// is not found, an empty vector is returned.
+	///
+	/// # Examples
+	/// ```
+	/// let package_list = PackageList::new();
+	/// let resolved_packages = package_list.resolve("x86_64", "apt", "default");
+	/// ```
+	#[must_use]
+	pub fn resolve(&self, arch: &str, pkgmgr: &str, list_name: &str) -> Vec<String> {
+		self.package_manager
+			.get(pkgmgr)
+			.and_then(|pm| pm.get(list_name))
+			.map(|list| {
+				let mut pkgs =
+					list.packages.get("all").map_or_else(Vec::new, std::clone::Clone::clone);
+				if let Some(arch_pkgs) = list.packages.get(arch) {
+					pkgs.extend(arch_pkgs.iter().cloned());
+				}
+				pkgs
+			})
+			.unwrap_or_default()
+	}
+}
+
+dyn_clone::clone_trait_object!(BootstrapOption);
+
+// todo: rewrite everything
+#[derive(Deserialize, Debug, Clone, Serialize)]
+pub struct Manifest {
+	#[serde(default)]
+	#[serde(rename = "pkg_list")]
+	pub packages: PackageList,
+
+	// #[serde(default)]
+	// #[serde(rename = "var")]
+	// pub vars: BTreeMap<String, Var>,
+	/// DNF configuration
+	// todo: dynamically load this?
+	// #[serde(default)]
+	// pub dnf: crate::builder::DnfRootBuilder,
+
+	#[serde(default)]
+	#[serde(rename = "target")]
+	pub targets: BTreeMap<String, Target>,
+}
+
+impl Manifest {
+	/// Load manifest from file
+	///
+	/// # Errors
+	///
+	/// This function will return an error if the file cannot be read or parsed.
+	pub fn load(path: &Path) -> color_eyre::Result<Self> {
+		Ok(hcl::de::from_body(ensan::parse(std::fs::read_to_string(path)?)?)?)
+	}
+}
+
+/// Variable types used for validation in `[Var]`
+#[derive(Deserialize, Debug, Clone, Serialize)]
+pub enum VarType {
+	String,
+	Int,
+	Object,
+}
+
+#[derive(Deserialize, Debug, Clone, Serialize)]
+pub struct Var {
+	#[serde(rename = "type")]
+	pub var_type: VarType,
+	pub default: Option<hcl::Value>,
+}
+
+#[derive(Deserialize, Debug, Clone, Serialize)]
+pub enum BootstrapMethod {
+	Oci,
+	Tar,
+	Dir,
+	Squashfs,
+	Dnf,
+}
+
+/// A variable
+/// ```hcl
+/// var "name" {
+///    type = "string"
+///    default = "value"
+/// }
+///
+/// ```
+#[derive(Deserialize, Debug, Clone, Serialize, Default)]
+#[serde(rename_all = "snake_case")]
+#[serde(tag = "type")]
+pub struct PartitionLayout {
+	#[serde(default)]
+	#[serde(rename = "partition")]
+	pub partitions: Vec<Partition>,
+}
+
+#[derive(Deserialize, Debug, Clone, Serialize)]
+pub struct Partition {
+
+	/// The size of the partition
+	/// 
+	/// Optional, if not specified, the partition will be the rest of the disk
+	#[serde(default)]
+	pub size: Option<ByteSize>,
+
+	/// The mountpoint for this partition
+	/// 
+	/// Optional, if not specified, the partition will not be mounted
+	#[serde(default)]
+	pub mountpoint: Option<String>,
+
+	/// Filesystem to format the partition with
+	/// 
+	/// Optional, if not specified, the partition will not be formatted
+	#[serde(default)]
+	pub filesystem: Option<String>,
+
+	/// GPT/MBR partition type
+	#[serde(rename = "type")]
+	pub partition_type: Option<PartitionType>,
+	/// This partition will be initialized with the block contents of this file
+	#[serde(default)]
+	pub copy_blocks: Option<String>,
+}
+
+#[derive(Deserialize, Debug, Clone, Serialize)]
+pub struct CopyFiles {
+	pub source: String,
+	pub destination: String,
+}
+
+// a target is a build target, like a make target.
+// you need to actually specify how the target is built
+// todo: possibly derive a target from another target?
+// ``hcl
+// target "id" {
+//
+// }
+// ```
+#[derive(Deserialize, Debug, Clone, Serialize, Default)]
+pub struct Target {
+	#[serde(rename = "type")]
+	pub target_type: String,
+	#[serde(default)]
+	pub copy_files: Vec<CopyFiles>,
+	// insert builder setup manifest here...
+	/// Scripts to run before and after the build
+	#[serde(default)]
+	pub scripts: ScriptsManifest,
+
+	#[serde(default)]
+	/// The builder to use for this target
+	pub builder: BuilderType,
+
+	#[serde(default)]
+	/// References to package lists to merge into the target I guess?
+	// todo: implement this
+	pub package_lists: Vec<String>,
+
+	#[serde(default)]
+	// #[serde(flatten)]
+	// partition_layout {
+	// 		partition {}
+	// }
+	pub partition_layout: PartitionLayout,
+}
diff --git a/src/cfg/mod.rs b/src/cfg/mod.rs
index a687941..b54cdb3 100644
--- a/src/cfg/mod.rs
+++ b/src/cfg/mod.rs
@@ -1,5 +1,5 @@
 pub mod auth;
-pub mod boot;
+// pub mod boot;
 pub mod ensan_fns;
 pub mod manifest;
 pub mod partition;
diff --git a/src/cfg/script.rs b/src/cfg/script.rs
index 05c0f54..bb012a7 100644
--- a/src/cfg/script.rs
+++ b/src/cfg/script.rs
@@ -20,6 +20,10 @@ const fn script_default_priority() -> i32 {
 	50
 }
 
+pub fn sort_script_priority(scripts: &mut [Script]) {
+	scripts.sort_by_key(|s| s.priority);
+}
+
 #[derive(Deserialize, Debug, Clone, Serialize, PartialEq, Eq)]
 // load script from file, or inline if there's one specified
 pub struct Script {
diff --git a/src/main.rs b/src/main.rs
index de8b309..60749a4 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,6 +1,6 @@
 #![warn(rust_2018_idioms)]
 
-mod builder;
+// mod builder;
 pub mod cfg;
 mod util;
 
@@ -52,8 +52,17 @@ impl std::str::FromStr for OutputFormat {
 #[command(author, version, about)]
 pub struct KatsuCli {
 	/// Config file location
+	#[arg(short, long, default_value = "main.katsu.hcl")]
 	config: PathBuf,
 
+	#[arg(short, long, default_value = ".")]
+	/// Project directory
+	/// 
+	/// By default, Katsu will look for the config file in the current directory.
+	/// 
+	// unimplemented yet, will just load the config file for now i guess
+	project_dir: PathBuf,
+
 	// #[arg(short, long, value_parser = value_parser!(OutputFormat))]
 	// output: OutputFormat,
 	#[arg(short, long,env = "KATSU_SKIP_PHASES", value_parser = value_parser!(SkipPhases), default_value = "")]
@@ -68,6 +77,10 @@ pub struct KatsuCli {
 	output_file: Option<PathBuf>,
 }
 
+impl KatsuCli {
+	
+}
+
 /// # Panics
 /// - cannot set default subscriber
 /// - cannot escalate to sudo
@@ -107,18 +120,17 @@ fn main() -> color_eyre::Result<()> {
 		Some(ext) => tracing::warn!(cfg=?cli.config, ?ext, "Unknown file extension for config file; trying to parse as HCL"),
 		None => tracing::warn!(cfg=?cli.config, "Config file does not have any file extensions; trying to parse as HCL"),
 	};
+
+	let debug_str: hcl::Value = hcl::from_str(&std::fs::read_to_string(&cli.config)?)?;
+	println!("Debug: {debug_str:#?}");
+
 	let mut manifest = cfg::manifest::Manifest::load(&cli.config)?;
 
 	// check for overrides
 
-	if let Some(arch) = cli.arch {
-		manifest.dnf.arch = Some(arch);
-	}
-
-	if let Some(output_file) = cli.output_file {
-		manifest.out_file =
-			Some(output_file.to_str().expect("Cannot convert output_file to string").to_owned());
-	}
+	// if let Some(arch) = cli.arch {
+	// 	manifest.dnf.arch = Some(arch);
+	// }
 
 	trace!(?manifest, "Loaded manifest");
 
diff --git a/tests/main.katsu.hcl b/tests/main.katsu.hcl
index 239187e..2e1c2fb 100644
--- a/tests/main.katsu.hcl
+++ b/tests/main.katsu.hcl
@@ -1,74 +1,8 @@
-// This is a draft of the custom HCL configuration format for Katsu
-// Extensions should be .katsu.hcl'
-// 
-// non-blocks in the top level are considered variables, however if you want to be more explicit and
-// type them, you can use the `var` keyword
-
-/*
-                                                  +---------------------------+                                          
-                                                  |                           |                                          
-                                                  |                           |                                          
-                                                  |                           |                                          
-                                                  |       base                |                                          
-                                                  |                           |                                          
-                                                  |                           +------------------------------+           
-                                                  |                           |                              |           
-                                                  |                           |                              |           
-                                      +-----------+-------+-------------------+------+                       |           
-                                      |                   |                          |                       |           
-                                      |                   |                          |                       |           
-                                      |                   |                          |                       |           
-                                      |                   |                          |                       |           
-                                      |                   |                          |                       |           
-                                      |                   |                          |                       |           
-                                      |                   |                          |                       |           
-                                      |                   |                          |                       |           
-                                      |                   |               +----------v----------+  +---------v----------+
-                             +--------v---------+ +-------v--------+      |                     |  |                    |
-                             |                  | |                |      |                     |  |                    |
-                             |                  | |                |      |                     |  |                    |
-                             |                  | |                |      |                     |  |                    |
-                             |    desktop       | |  minimal       |      |     oci             |  |   minimal disk     |
-                             |                  | |     squash     |      |                     |  |                    |
-                             |                  | |                |      |                     |  |                    |
-                             |                  | |                |      |                     |  |                    |
-                             |                  | |                |      |                     |  |                    |
-                  +----------+-------+----------+-+----------------+      |                     |  |                    |
-                  |                  |            |                       +---------------------+  +--------------------+
-                  |                  |            |                                                                      
-                  |                  |            |                                                                      
-          +-------+-------+  +-------v------+  +--v-----------+                                                          
-          |       v       |  |              |  |              |                                                          
-          |               |  |              |  |              |                                                          
-          |               |  |              |  | Spin 3       |                                                          
-          | Spin 1        |  |  Spin 2      |  |              |                                                          
-          |               |  |              |  |              |                                                          
-          |               |  |              |  |              |                                                          
-          |         +-+   |  |              |  |              |                                                          
-        +-+---------+-+---+  +---+---------++  +--+---------+-+                                                          
-        |             |          |         |      |         |                                                            
-+-------v---+ +-------v----+ +---+---++----v-+ +--+---++----+-+                                                          
-|           | |            | |   v   ||      | |  v   ||    v |                                                          
-|           | |            | |squash ||disk  | | sqsh || disk |                                                          
-| squash    | |            | |       ||      | |      ||      |                                                          
-|           | | disk       | |       ||      | +------++------+                                                          
-|           | |            | ++------++------+ |      |                                                                  
-|           | |            |  |      |         | iso  |                                                                  
-++----------+ +------------+  | iso  |         |      |                                                                  
- +----------+                 |      |         +------+                                                                  
- |          |                 +------+                                                                                   
- |          |                                                                                                            
- |  iso     |                                                                                                            
- |          |                                                                                                            
- |          |                                                                                                            
- +----------+                                                                                                            
- */
-
 var "foo" {
     type = "string"
     default = "bar"
 }
-
+        
 var "dnf_releasever" {
     default = 40
 }
@@ -80,26 +14,21 @@ var "dnf_releasever" {
 
 // you should reference data from a submodule by doing module.data_name
 
-
-// in Rust code we can keep all of this in the heap, it's not a big deal
-// (Box<PkgList>) or something like that, Arc maybe?
-
 pkg_list "dnf" "core" {
     default = [
         "@core",
         "kernel-*" // you can glob here because DNF lets you do that
     ]
-    arch_specific = {
-        "x86_64" = [
-            "grub2-efi-x64",
-            "grub2-efi-x64-modules"
-        ]
-        "aarch64" = [
-            "grub2-efi-aarch64",
-            "grub2-efi-aarch64-modules"
-        ]
-    }
-    exclude_arch = {
+    x86_64 = [
+        "grub2-efi-x64",
+        "grub2-efi-x64-modules"
+    ]
+
+    aarch64 = [
+        "grub2-efi-aarch64",
+        "grub2-efi-aarch64-modules"
+    ]
+    exclude = {
         "x86_64" = [
             "grub2-efi-aarch64",
             "grub2-efi-aarch64-modules"
@@ -110,176 +39,22 @@ pkg_list "dnf" "core" {
         ]
     }
 }
-// Output block
-// 
-// There will be an `output.output_file` key that will be evaluated to the output file
-// 
-// So one could create a new `squashfs` output that bootstraps the system and packs it into a squashfs
-// 
-// Then do an `iso` output that copies output.squashfs to root
-// 
-// First field is the output type, second field is the output name
-// 
-// For "disk" and "iso" types, you may mount the output file to a directory,
-// 
-// For "iso" and disk types you may want to put custom trees as URIs like `$part:/path_to_file` or something
-// if you are not expecting to make it a full root filesystem
-// 
-// Planned types:
-// - disk - Partitioned disk images with optional mountpoints for post-processing and scripting
-// - dir - Outputs an entire directory tree, useful as a pipeline to further outputs
-// - squashfs - Squashfs filesystems, Can be bootstrapped standalone or from a dir output
-// - iso - ISO images, can be bootstrapped from a squashfs or dir output, Needs manual layout setup (we need helpers for this)
-// - tar - Tarballs, can be bootstrapped from a dir output
-// - oci - OCI base image, works similarly to a `tar` output, but writes additional OCI metadata JSONs
-// 
-// `disk` outputs should always have its own partition layout, and should be used as the final pass,
-// we will not be supporting disk bootstrap types
-output "disk" "xfce" {
-    
-    // dev note: the output object is gonna be crazy, we would need like a million optional fields with validation...
-    
-    // Method to bootstrap the system.
-    // Can be a package manager like `dnf`, or from a docker image, tarball or squashfs
 
-    
-    // Planned possible bootstrap methods:
-    // - oci - Copies data from an OCI image using `podman export` or `skopeo` or something, behaviour will be similar to a `dir` or `tar` input
-    // - tar - Extracts a tarball to the tree
-    // - squashfs - unsquash the squashfs to the tree
-    // - dir - Copy files from a directory to the tree
-    // - dnf - Install packages from a package list
-    // 
-    bootstrap_method = "dnf"
-    dnf {
-        // there will be an `arch` key here, implied by the host environment or explicitly set by an argument
-        
-        // import package lists from this
-        package_lists = [
-            pkg_list.dnf.core,
-            pkg_list.dnf.xfce
-            // module.foo.pkg_list.dnf.bar
-        ]
-        
-        // or just list packages here
-        
-        packages {
-            default = [
-                
-            ]
-            exclude = []
-            arch_specific = {
-                "x86_64" = [
-                    
-                ]
-                "aarch64" = [
-                    
-                ]
-            }
-            exclude_arch = {
-                "x86_64" = [
-                    
-                ]
-                "aarch64" = [
-                    
-                ]
-            }   
-        }
-    }
+// target block
+// a target is an artifact output
+
+target "meow" {
+    type = "idk"
     partition_layout {
-        // layout here, partno is sorted by order of appearance
-        // the table here will be then passed to a respective partitioning table
-        // structure (i.e Partition for disks, Iso9660, etc.)
-        partition {
-            label = "ESP"
-            type = "esp" // or guid = "$guid"
-            filesystem = "fat32"
-            size = "512M"
-            mountpoint = "/boot/efi"
-        }
         partition {
             label = "boot"
-            type = "xbootldr"
-            filesystem = "ext4"
-            size = "2G"
             mountpoint = "/boot"
-        }
-        partition {
-            type = "cros-kernel"
-            // optional copy_blocks directive to `dd` blocks to the filesystem
-            // instead of copying files to the filesystem
-            size = "16M"
-            // copy_blocks takes source file as abspath, or relative to the current manifest
-            copy_blocks = "/usr/share/submarine/submarine.kpart"
+            filesystem = "ext4"
         }
         partition {
             label = "root"
-            type = "root" // will be inferred from system arch
-            filesystem = "ext4"
-            size = "rest"
             mountpoint = "/"
+            filesystem = "ext4"
         }
     }
-    // optional copy_files directive to copy files to the filesystem, will be relative to
-    // root partition or something like systemd-repart?
-    // 
-    // File copying should be done after bootstrapping the system
-    
-    copy {
-        // Path should be relative to the root partition
-        source = "./somefile"
-        // Destination should be relative to the root of the target directory
-        // It can be a full root filesystem or just a normal directory tree (Accomodating a custom file layout
-        // possibly may want for a live image where you can place grub configs and squashfs images in the root)
-        destination = "/somefile"
-    }
-    
-    // Sort execution of scripts by priority or placement, whichever comes first
-    // Priority should be integer, the lower the number, the earlier it is executed
-    // 
-    // note: needs custom sorting function to sort by index or priority, selecting priority over index if exists
-    
-    // index will always be defined, so it will be used as a fallback if priority is not defined
-    script {
-        id = "grub"
-        source = file("./grub.cfg")
-        priority = 10
-    }
-}
-
-
-// If you do an output based on an existing rootfs, you can even do multiple passes :3
-// So say, new disk output based on squashfs output
-// - squashfs output's post scripts sets up some initial filesystem structure
-// - disk output unpacks squashfs into the disk image, with the mountpoints in place
-// - disk output now has a new set of post scripts that do some additional setup, like bootloader setup
-// and such
-// 
-// - or an ISO output that copies the squash image itself to the ISO and sets up the bootloader
-// to load that squash image as root
-
-
-output "iso" "xfce" {
-    // There will be no bootstrapping, we're just repacking an existing output
-    bootstrap_method = "none"
-    
-    // We do not mount ISO files like a rootfs, so we will be using the custom URI paths scheme
-    
-    partition_layout {
-        partition {
-            // partno is used, label may not be included in the resulting ISO
-            // We can use the label to refer to the partition in the copy_files directive
-            label = "esp"
-            type = "esp"
-            filesystem = "fat32"
-        }
-        partition {
-            label = "content"
-            type = "isofs"
-        }
-    }
-    copy {
-        source = output.squashfs.xfce.output_file // evaluated from fs.katsu.hcl
-        destination = "content:/LiveOS/xfce.iso" // somehow evaluate from context of current scope from partition_layout?
-    }
 }
\ No newline at end of file
diff --git a/tests/ng/.gitignore b/tests/ng/.gitignore
deleted file mode 100644
index 511d972..0000000
--- a/tests/ng/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-katsu-work/
diff --git a/tests/ng/katsu-arm.yaml b/tests/ng/katsu-arm.yaml
deleted file mode 100644
index e1a88da..0000000
--- a/tests/ng/katsu-arm.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-import:
-  - katsu.yaml
-# Example manifest for a Katsu build
-builder: dnf
-distro: Katsu Ultramarine ARM
-
-disk:
-  size: 8GiB
-  partitions:
-    - label: EFI
-      type: esp
-      size: 512MiB
-      filesystem: efi
-      mountpoint: /boot/efi
-
-    - label: boot
-      type: xbootldr
-      size: 1GiB
-      filesystem: ext4
-      mountpoint: /boot
-
-    - label: root
-      type: root-arm64
-      flags:
-        - grow-fs
-      # size: 2.5MiB
-      filesystem: ext4
-      mountpoint: /
-
-dnf:
-  arch: aarch64
-  releasever: 39
diff --git a/tests/ng/katsu-iso-limine.yaml b/tests/ng/katsu-iso-limine.yaml
deleted file mode 100644
index 34ace13..0000000
--- a/tests/ng/katsu-iso-limine.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-# Example manifest for a Katsu build
-import:
-  - modules/base.yaml
-  - modules/live-image/live.yaml
-builder: dnf
-distro: Katsu Ultramarine
-
-kernel_cmdline: "quiet rhgb"
-
-bootloader: limine
-
-dnf:
-  releasever: 39
-  options:
-    - --setopt=keepcache=True
-    - --nogpgcheck
-    - --setopt=cachedir=/var/cache/dnf
-  packages:
-    - dracut-config-generic
-    - dracut-live
-    - dracut-config-generic
-    - dracut-network
-    - anaconda-dracut
-    - dracut-squash
-    - "@xfce-desktop"
-    - anaconda-live
-    - libblockdev-nvdimm
-    - isomd5sum
-    - limine
diff --git a/tests/ng/katsu-iso.yaml b/tests/ng/katsu-iso.yaml
deleted file mode 100644
index ca8e7ed..0000000
--- a/tests/ng/katsu-iso.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-# Example manifest for a Katsu build
-import:
-  - modules/base.yaml
-  - modules/live-image/live.yaml
-builder: dnf
-distro: Katsu Ultramarine
-
-kernel_cmdline: "quiet rhgb"
-
-bootloader: grub
-
-dnf:
-  releasever: 39
-  options:
-    - --setopt=keepcache=True
-    - --nogpgcheck
-    - --setopt=cachedir=/var/cache/dnf
-  packages:
-    - dracut-config-generic
-    - dracut-live
-    - dracut-config-generic
-    - dracut-network
-    - anaconda-dracut
-    - dracut-squash
-    - "@xfce-desktop"
-    - anaconda-live
-    - libblockdev-nvdimm
-    - isomd5sum
diff --git a/tests/ng/katsu-script-test.yaml b/tests/ng/katsu-script-test.yaml
deleted file mode 100644
index ed472e5..0000000
--- a/tests/ng/katsu-script-test.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-import:
-  - modules/tests.yaml
-
-builder: dnf
-
-dnf:
-  options:
-    - --nogpgcheck
-  repodir: modules/repodir/
-  releasever: 39
-  packages:
-    - busybox
diff --git a/tests/ng/katsu.yaml b/tests/ng/katsu.yaml
deleted file mode 100644
index db3c402..0000000
--- a/tests/ng/katsu.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-# Example manifest for a Katsu build
-builder: dnf
-distro: Katsu Ultramarine
-
-import:
-  - modules/base.yaml
-
-scripts:
-  post:
-    - id: grub-install
-      name: Install GRUB
-      file: modules/scripts/grub-install.sh
-
-disk:
-  size: 8GiB
-  partitions:
-    - label: EFI
-      type: esp
-      size: 512MiB
-      filesystem: efi
-      mountpoint: /boot/efi
-
-    - label: boot
-      type: xbootldr
-      size: 1GiB
-      filesystem: ext4
-      mountpoint: /boot
-
-    - label: root
-      type: root
-      flags:
-        - grow-fs
-      # size: 2.5MiB
-      filesystem: ext4
-      mountpoint: /
-dnf:
-  dnf5: true
-  releasever: 39
diff --git a/tests/ng/modules/base.yaml b/tests/ng/modules/base.yaml
deleted file mode 100644
index 93bad70..0000000
--- a/tests/ng/modules/base.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-builder: dnf
-
-users:
-  - username: ultramarine
-    # plaintext password: ultramarine
-    password: "$y$j9T$6/DebcxXazPrtBYnNXtEM.$yaUJHww5Mo1L8xNJ9IDJ.bvKOrIJxAG9PGQKWioBMx3"
-    groups:
-      - wheel
-
-scripts:
-  post:
-    - id: post-test
-      name: Postinstall test
-      inline: |
-        echo "Hello from post.sh"
-
-    - id: image-cleanup
-      name: Clean up root filesystem
-      file: scripts/image-cleanup.sh
-
-    - id: selinux-label
-      name: Relabel SELinux for new filesystem
-      file: scripts/selinux.sh
-
-
-dnf:
-  releasever: 39
-  repodir: repodir/
-  options:
-    - --setopt=cachedir=/var/cache/dnf
-    - --nogpgcheck
-    - --setopt=keepcache=True
-  exclude:
-    - fedora-release*
-    - generic-release*
-  packages:
-    - filesystem
-    - setup
-    - lvm2
-    - btrfs-progs
-    - dmraid
-    - nvme-cli
-    - kernel
-    - glibc
-    - glibc-common
-    - dracut-config-generic
-    - dracut-tools
-    - dnf
-    - dracut
-    # - mkpasswd # maybe not needed soon
-    - "@core"
-    - "@standard"
-    - grub2-tools
-    - "@hardware-support"
-    - NetworkManager
-    - rpm
-    - libgomp
-    - ultramarine-release-identity-basic
-    - ultramarine-release-basic
-    - fedora-repos
-    - efibootmgr
-
-  arch_packages:
-    aarch64:
-      - grub2-efi-aa64
-      - grub2-efi-aa64-modules
-      - grub2-efi-aa64-cdboot
-      - shim-aa64
-      - shim-unsigned-aarch64
-      - bcm283x-firmware
-      - bcm283x-overlays
-      - "@arm-tools"
-    x86_64:
-      - grub2-efi-x64
-      - grub2-efi-x64-modules
-      - grub2-efi-x64-cdboot
-      - grub2-pc
-      - grub2-pc-modules
-      - shim-x64
-      - shim-unsigned-x64
diff --git a/tests/ng/modules/live-image/live.yaml b/tests/ng/modules/live-image/live.yaml
deleted file mode 100644
index ccee854..0000000
--- a/tests/ng/modules/live-image/live.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-iso:
-  volume_id: ULTRAMARINE-TEST
-
-scripts:
-  post:
-    - id: liveimage-setup
-      name: Set up Live Image
-      file: liveimage.sh
-
-dnf:
-  releasever: 39
diff --git a/tests/ng/modules/live-image/liveimage.sh b/tests/ng/modules/live-image/liveimage.sh
deleted file mode 100644
index 39a5dcc..0000000
--- a/tests/ng/modules/live-image/liveimage.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash -x
-
-systemctl disable systemd-networkd-wait-online systemd-networkd systemd-networkd.socket
-
-systemctl set-default graphical.target
diff --git a/tests/ng/modules/repodir/fedora-cisco-openh264.repo b/tests/ng/modules/repodir/fedora-cisco-openh264.repo
deleted file mode 100644
index 02150d9..0000000
--- a/tests/ng/modules/repodir/fedora-cisco-openh264.repo
+++ /dev/null
@@ -1,22 +0,0 @@
-[fedora-cisco-openh264]
-name=Fedora $releasever openh264 (From Cisco) - $basearch
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-cisco-openh264-$releasever&arch=$basearch
-type=rpm
-enabled=1
-metadata_expire=14d
-repo_gpgcheck=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=True
-
-[fedora-cisco-openh264-debuginfo]
-name=Fedora $releasever openh264 (From Cisco) - $basearch - Debug
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-cisco-openh264-debug-$releasever&arch=$basearch
-type=rpm
-enabled=0
-metadata_expire=14d
-repo_gpgcheck=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=True
-
diff --git a/tests/ng/modules/repodir/fedora-updates.repo b/tests/ng/modules/repodir/fedora-updates.repo
deleted file mode 100644
index 9d9f2fd..0000000
--- a/tests/ng/modules/repodir/fedora-updates.repo
+++ /dev/null
@@ -1,36 +0,0 @@
-[updates]
-name=Fedora $releasever - $basearch - Updates
-#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Everything/$basearch/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
-enabled=1
-countme=1
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[updates-debuginfo]
-name=Fedora $releasever - $basearch - Updates - Debug
-#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Everything/$basearch/debug/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch
-enabled=0
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[updates-source]
-name=Fedora $releasever - Updates Source
-#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Everything/SRPMS/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f$releasever&arch=$basearch
-enabled=0
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
diff --git a/tests/ng/modules/repodir/fedora.repo b/tests/ng/modules/repodir/fedora.repo
deleted file mode 100644
index f9bfbb1..0000000
--- a/tests/ng/modules/repodir/fedora.repo
+++ /dev/null
@@ -1,36 +0,0 @@
-[fedora]
-name=Fedora $releasever - $basearch
-#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
-enabled=1
-countme=1
-metadata_expire=7d
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[fedora-debuginfo]
-name=Fedora $releasever - $basearch - Debug
-#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/tree/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch
-enabled=0
-metadata_expire=7d
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[fedora-source]
-name=Fedora $releasever - Source
-#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/source/tree/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasever&arch=$basearch
-enabled=0
-metadata_expire=7d
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
diff --git a/tests/ng/modules/repodir/rpmfusion-free-tainted.repo b/tests/ng/modules/repodir/rpmfusion-free-tainted.repo
deleted file mode 100644
index 906bf6f..0000000
--- a/tests/ng/modules/repodir/rpmfusion-free-tainted.repo
+++ /dev/null
@@ -1,33 +0,0 @@
-[rpmfusion-free-tainted]
-name=RPM Fusion for Fedora $releasever - Free tainted
-#baseurl=http://download1.rpmfusion.org/free/fedora/tainted/$releasever/$basearch/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-tainted-$releasever&arch=$basearch
-enabled=1
-metadata_expire=6h
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-
-[rpmfusion-free-tainted-debuginfo]
-name=RPM Fusion for Fedora $releasever - Free tainted - Debug
-#baseurl=http://download1.rpmfusion.org/free/fedora/tainted/$releasever/$basearch/debug/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-tainted-debug-$releasever&arch=$basearch
-enabled=0
-metadata_expire=6h
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-
-[rpmfusion-free-tainted-source]
-name=RPM Fusion for Fedora $releasever - Free tainted - Source
-#baseurl=http://download1.rpmfusion.org/free/fedora/tainted/$releasever/SRPMS/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-tainted-source-$releasever&arch=$basearch
-enabled=0
-metadata_expire=6h
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-
diff --git a/tests/ng/modules/repodir/rpmfusion-free-updates.repo b/tests/ng/modules/repodir/rpmfusion-free-updates.repo
deleted file mode 100644
index 1405931..0000000
--- a/tests/ng/modules/repodir/rpmfusion-free-updates.repo
+++ /dev/null
@@ -1,31 +0,0 @@
-[rpmfusion-free-updates]
-name=RPM Fusion for Fedora $releasever - Free - Updates
-#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-$releasever&arch=$basearch
-enabled=1
-enabled_metadata=1
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-
-[rpmfusion-free-updates-debuginfo]
-name=RPM Fusion for Fedora $releasever - Free - Updates Debug
-#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/debug/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-debug-$releasever&arch=$basearch
-enabled=0
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-
-[rpmfusion-free-updates-source]
-name=RPM Fusion for Fedora $releasever - Free - Updates Source
-#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/SRPMS/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-source-$releasever&arch=$basearch
-enabled=0
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-
diff --git a/tests/ng/modules/repodir/rpmfusion-free.repo b/tests/ng/modules/repodir/rpmfusion-free.repo
deleted file mode 100644
index e65aa5b..0000000
--- a/tests/ng/modules/repodir/rpmfusion-free.repo
+++ /dev/null
@@ -1,33 +0,0 @@
-[rpmfusion-free]
-name=RPM Fusion for Fedora $releasever - Free
-#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/os/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-$releasever&arch=$basearch
-enabled=1
-metadata_expire=14d
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-
-[rpmfusion-free-debuginfo]
-name=RPM Fusion for Fedora $releasever - Free - Debug
-#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/debug/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-debug-$releasever&arch=$basearch
-enabled=0
-metadata_expire=7d
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-
-[rpmfusion-free-source]
-name=RPM Fusion for Fedora $releasever - Free - Source
-#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/source/SRPMS/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-source-$releasever&arch=$basearch
-enabled=0
-metadata_expire=7d
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-
diff --git a/tests/ng/modules/repodir/rpmfusion-nonfree-tainted.repo b/tests/ng/modules/repodir/rpmfusion-nonfree-tainted.repo
deleted file mode 100644
index ee408aa..0000000
--- a/tests/ng/modules/repodir/rpmfusion-nonfree-tainted.repo
+++ /dev/null
@@ -1,33 +0,0 @@
-[rpmfusion-nonfree-tainted]
-name=RPM Fusion for Fedora $releasever - Nonfree tainted
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/tainted/$releasever/$basearch/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-tainted-$releasever&arch=$basearch
-enabled=1
-metadata_expire=14d
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-
-[rpmfusion-nonfree-tainted-debuginfo]
-name=RPM Fusion for Fedora $releasever - Nonfree tainted - Debug
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/tainted/$releasever/$basearch/debug/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-tainted-debug-$releasever&arch=$basearch
-enabled=0
-metadata_expire=7d
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-
-[rpmfusion-nonfree-tainted-source]
-name=RPM Fusion for Fedora $releasever - Nonfree tainted - Source
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/tainted/$releasever/SRPMS/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-tainted-source-$releasever&arch=$basearch
-enabled=0
-metadata_expire=7d
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-
diff --git a/tests/ng/modules/repodir/rpmfusion-nonfree-updates.repo b/tests/ng/modules/repodir/rpmfusion-nonfree-updates.repo
deleted file mode 100644
index 6d4d825..0000000
--- a/tests/ng/modules/repodir/rpmfusion-nonfree-updates.repo
+++ /dev/null
@@ -1,31 +0,0 @@
-[rpmfusion-nonfree-updates]
-name=RPM Fusion for Fedora $releasever - Nonfree - Updates
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch
-enabled=1
-enabled_metadata=1
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-
-[rpmfusion-nonfree-updates-debuginfo]
-name=RPM Fusion for Fedora $releasever - Nonfree - Updates Debug
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/debug/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-debug-$releasever&arch=$basearch
-enabled=0
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-
-[rpmfusion-nonfree-updates-source]
-name=RPM Fusion for Fedora $releasever - Nonfree - Updates Source
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/SRPMS/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-source-$releasever&arch=$basearch
-enabled=0
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-
diff --git a/tests/ng/modules/repodir/rpmfusion-nonfree.repo b/tests/ng/modules/repodir/rpmfusion-nonfree.repo
deleted file mode 100644
index dfb5110..0000000
--- a/tests/ng/modules/repodir/rpmfusion-nonfree.repo
+++ /dev/null
@@ -1,34 +0,0 @@
-[rpmfusion-nonfree]
-name=RPM Fusion for Fedora $releasever - Nonfree
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/os/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-$releasever&arch=$basearch
-enabled=1
-enabled_metadata=1
-metadata_expire=14d
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-
-[rpmfusion-nonfree-debuginfo]
-name=RPM Fusion for Fedora $releasever - Nonfree - Debug
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/debug/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-debug-$releasever&arch=$basearch
-enabled=0
-metadata_expire=7d
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-
-[rpmfusion-nonfree-source]
-name=RPM Fusion for Fedora $releasever - Nonfree - Source
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/source/SRPMS/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-source-$releasever&arch=$basearch
-enabled=0
-metadata_expire=7d
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-
diff --git a/tests/ng/modules/repodir/terra.repo b/tests/ng/modules/repodir/terra.repo
deleted file mode 100644
index 1c61569..0000000
--- a/tests/ng/modules/repodir/terra.repo
+++ /dev/null
@@ -1,11 +0,0 @@
-[terra]
-name=Terra Packages $releasever
-baseurl=https://repos.fyralabs.com/terra$releasever
-metadata_expire=6h
-type=rpm
-skip_if_unavailable=True
-gpgcheck=1
-gpgkey=https://repos.fyralabs.com/terra$releasever/key.asc
-repo_gpgcheck=1
-enabled=1
-enabled_metadata=1
\ No newline at end of file
diff --git a/tests/ng/modules/repodir/ultramarine.repo b/tests/ng/modules/repodir/ultramarine.repo
deleted file mode 100644
index cffe203..0000000
--- a/tests/ng/modules/repodir/ultramarine.repo
+++ /dev/null
@@ -1,11 +0,0 @@
-[ultramarine]
-name=Ultramarine Linux $releasever
-baseurl=https://repos.fyralabs.com/um$releasever
-metadata_expire=6h
-type=rpm
-skip_if_unavailable=True
-gpgcheck=1
-gpgkey=https://repos.fyralabs.com/um$releasever/key.asc
-repo_gpgcheck=1
-enabled=1
-enabled_metadata=1
diff --git a/tests/ng/modules/scripts/grub-install.sh b/tests/ng/modules/scripts/grub-install.sh
deleted file mode 100644
index af7bb1e..0000000
--- a/tests/ng/modules/scripts/grub-install.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-set -x
-# Disable os-prober for now
-
-echo "Disabling os-prober..."
-
-echo "GRUB_DISABLE_OS_PROBER=true" > /etc/default/grub
-grub2-mkconfig > /boot/grub2/grub.cfg
-rm /etc/default/grub
-
-
-# get /dev/ of /boot, or / if /boot is not a separate partition
-function find_bootdev {
-    # try findmnt /boot
-    if findmnt -n -o SOURCE /boot; then
-        bootdev=$(findmnt -n -o SOURCE /boot)
-    else
-        bootdev=$(findmnt -n -o SOURCE /)
-    fi
-}
-
-
-find_bootdev
-# get blkid of /boot
-bootid=$(blkid -s UUID -o value $bootdev)
-
-cat << EOF > /boot/efi/EFI/fedora/grub.cfg
-search --no-floppy --fs-uuid --set=dev $bootid
-set prefix=(\$dev)/grub2
-
-export \$prefix
-configfile \$prefix/grub.cfg
-EOF
-
-# edit ro to rw in all entries
-
-sed -i 's/ ro  / rw  /g' /boot/loader/entries/*.conf
-
-
-dracut -vfN --add-drivers "virtio virtio_blk virtio_scsi xchi_pci mmc" --regenerate-all
\ No newline at end of file
diff --git a/tests/ng/modules/scripts/image-cleanup.sh b/tests/ng/modules/scripts/image-cleanup.sh
deleted file mode 100644
index fb854ca..0000000
--- a/tests/ng/modules/scripts/image-cleanup.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash -x
-
-systemctl disable systemd-networkd-wait-online systemd-networkd systemd-networkd.socket
-systemctl disable chronyd
-# systemctl disable polkit
-# Add polkitd user manually, weird hack because preinstall script doesn't run
-cat << EOF > /usr/lib/sysusers.d/extras.conf
-# This is a really weird hack
-#Type  Name    ID   Argument
-g      polkitd 114  
-u      polkitd 114:114 "User for polkitd" - -
-
-g      rpc     32
-u      rpc     32:32  "Rpcbind Daemon" - -
-EOF
-
-echo max_parallel_downloads=20 >> /etc/dnf/dnf.conf
-echo defaultyes=True >> /etc/dnf/dnf.conf
-
-systemd-sysusers
-
-# set password for root to "ultramarine"
-
-# echo "root:ultramarine" | chpasswd
-
-# Set graphical target to default
-systemctl set-default graphical.target
-
-
-
-
-# if aarch64
-	
-arch=$(uname -m)
-if [[ $arch == "aarch64" ]]; then
-cp -P /usr/share/uboot/rpi_arm64/u-boot.bin /boot/efi/rpi-u-boot.bin
-cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
-cp -P /usr/share/uboot/rpi_4/u-boot.bin /boot/efi/rpi4-u-boot.bin
-fi
-rm -f /var/lib/systemd/random-seed
-rm -f /etc/NetworkManager/system-connections/*.nmconnection
-
-rm -f /etc/machine-id
-touch /etc/machine-id
-
-rm -f /var/lib/rpm/__db*
\ No newline at end of file
diff --git a/tests/ng/modules/scripts/pre-test2.sh b/tests/ng/modules/scripts/pre-test2.sh
deleted file mode 100644
index 1e2be50..0000000
--- a/tests/ng/modules/scripts/pre-test2.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-echo "Hello from pre2.sh"
-echo "This is an integration test for Katsu, the Ultramarine image builder."
-# check if $CHROOT is set, if not, exit
-
-
-echo "Testing if CHROOT is set..."
-if [ -z "$CHROOT" ]; then
-    echo "CHROOT is not set, exiting."
-    exit 1
-fi
-echo "CHROOT: $CHROOT"
-
-# check if $CHROOT is a directory, if not, exit
-echo "Testing if CHROOT is a directory..."
-if [ ! -d "$CHROOT" ]; then
-    echo "CHROOT is not a directory, exiting."
-    exit 1
-fi
-
-# check if $CHROOT is readable, if not, exit
-echo "Testing if CHROOT is readable..."
-if [ ! -r "$CHROOT" ]; then
-    echo "CHROOT is not readable, exiting."
-    exit 1
-fi
-
-# check if $CHROOT is writable, if not, exit
-echo "Testing if CHROOT is writable..."
-if [ ! -w "$CHROOT" ]; then
-    echo "CHROOT is not writable, exiting."
-    exit 1
-fi
-
-
-
-echo "Enjoy!"
\ No newline at end of file
diff --git a/tests/ng/modules/scripts/selinux.sh b/tests/ng/modules/scripts/selinux.sh
deleted file mode 100644
index f6d8a16..0000000
--- a/tests/ng/modules/scripts/selinux.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash -x
-
-echo "Setting up SELinux..."
-
-setfiles -F -e /proc -e /sys -e /dev -e /bin /etc/selinux/targeted/contexts/files/file_contexts / || true
-setfiles -F -e /proc -e /sys -e /dev /etc/selinux/targeted/contexts/files/file_contexts.bin /bin || true
diff --git a/tests/ng/modules/tests.yaml b/tests/ng/modules/tests.yaml
deleted file mode 100644
index b732399..0000000
--- a/tests/ng/modules/tests.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-scripts:
-  pre:
-    - id: pre-test
-      name: Preinstall test
-      inline: |
-        echo "Hello from pre.sh"
-    - id: pre-test2
-      name: Preinstall test 2
-      file: scripts/pre-test2.sh
diff --git a/tests/ng/recurse/manifest.yaml b/tests/ng/recurse/manifest.yaml
deleted file mode 100644
index 67e9cbc..0000000
--- a/tests/ng/recurse/manifest.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-import:
-  - recurse1.yaml
-
-distro: RecursiveOS
-releasever: 1
-
-dnf:
-  packages:
-    - foo
\ No newline at end of file
diff --git a/tests/ng/recurse/recurse1.yaml b/tests/ng/recurse/recurse1.yaml
deleted file mode 100644
index f5c117d..0000000
--- a/tests/ng/recurse/recurse1.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-import:
-  - recurse2.yaml
-
-
-dnf:
-  packages:
-    - baz
-
-scripts:
-  pre:
-    - inline: |
-        echo "Hello from recurse1.yaml"
diff --git a/tests/ng/recurse/recurse2.yaml b/tests/ng/recurse/recurse2.yaml
deleted file mode 100644
index f0368e4..0000000
--- a/tests/ng/recurse/recurse2.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-dnf:
-  packages:
-    - bar
-
-scripts:
-  pre:
-    - inline: |
-        echo "Hello from recurse2.yaml"
\ No newline at end of file
diff --git a/tests/pkglist.katsu.hcl b/tests/pkglist.katsu.hcl
new file mode 100644
index 0000000..66779a9
--- /dev/null
+++ b/tests/pkglist.katsu.hcl
@@ -0,0 +1,13 @@
+pkg_list "test" "a" {
+    all = [
+        "a",
+        "b",
+        "c"
+    ]
+
+    exclude = {
+        all = [
+            "b"
+        ]
+    }
+}   
\ No newline at end of file
diff --git a/tests/test.katsu.hcl b/tests/reference.katsu.hcl
similarity index 98%
rename from tests/test.katsu.hcl
rename to tests/reference.katsu.hcl
index f8a1feb..239187e 100644
--- a/tests/test.katsu.hcl
+++ b/tests/reference.katsu.hcl
@@ -80,6 +80,7 @@ var "dnf_releasever" {
 
 // you should reference data from a submodule by doing module.data_name
 
+
 // in Rust code we can keep all of this in the heap, it's not a big deal
 // (Box<PkgList>) or something like that, Arc maybe?
 
@@ -155,8 +156,8 @@ output "disk" "xfce" {
         
         // import package lists from this
         package_lists = [
-            // pkg_list.dnf.core,
-            // pkg_list.dnf.xfce
+            pkg_list.dnf.core,
+            pkg_list.dnf.xfce
             // module.foo.pkg_list.dnf.bar
         ]
         
@@ -241,7 +242,7 @@ output "disk" "xfce" {
     // index will always be defined, so it will be used as a fallback if priority is not defined
     script {
         id = "grub"
-        // source = file("./grub.cfg")
+        source = file("./grub.cfg")
         priority = 10
     }
 }
@@ -278,7 +279,7 @@ output "iso" "xfce" {
         }
     }
     copy {
-        // source = output.squashfs.xfce.output_file // evaluated from fs.katsu.hcl
+        source = output.squashfs.xfce.output_file // evaluated from fs.katsu.hcl
         destination = "content:/LiveOS/xfce.iso" // somehow evaluate from context of current scope from partition_layout?
     }
 }
\ No newline at end of file