feat: simplify configs

katsu/modules/base/base.yaml

@@ -6,7 +6,6 @@ scripts:
     - id: selinux-setup
       name: Set up SELinux
       file: selinux.sh
-
 dnf:
   releasever: 39
   repodir: repodir
@@ -19,53 +18,54 @@ dnf:
   exclude:
     - fedora-release*
     - generic-release*
-  packages:
-    - filesystem
-    - setup
-    - lvm2
-    - btrfs-progs
-    - dmraid
-    - nvme-cli
-    - kernel
-    - kernel-devel
-    - kernel-modules
-    - kernel-core
-    - glibc
-    - glibc-common
-    - dracut-config-generic
-    - dracut-tools
-    - dnf
-    - dracut
-    - "@core"
-    - grub2-tools
-    - "@hardware-support"
-    - NetworkManager
-    - rpm
-    - libgomp
-    # - ultramarine-release-identity-basic
-    # - ultramarine-release-basic
-    - fedora-repos
-    - efibootmgr
-    - ultramarine-release-common
-    - ultramarine-release
-    - ultramarine-repos
-    - "ultramarine-logos*"
+    - kernel-debug*
+#   packages:
+#     - filesystem
+#     - setup
+#     - lvm2
+#     - btrfs-progs
+#     - dmraid
+#     - nvme-cli
+#     - kernel
+#     - kernel-devel
+#     - kernel-modules
+#     - kernel-core
+#     - glibc
+#     - glibc-common
+#     - dracut-config-generic
+#     - dracut-tools
+#     - dnf
+#     - dracut
+#     - "@core"
+#     - grub2-tools
+#     - "@hardware-support"
+#     - NetworkManager
+#     - rpm
+#     - libgomp
+#     # - ultramarine-release-identity-basic
+#     # - ultramarine-release-basic
+#     - fedora-repos
+#     - efibootmgr
+#     - ultramarine-release-common
+#     - ultramarine-release
+#     - ultramarine-repos
+#     - "ultramarine-logos*"
 
-  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
+#   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

katsu/modules/flagship/flagship-live.yaml

@@ -1,11 +1,27 @@
+builder: dnf
+
 import:
-  - budgie.yaml
   - ../base/base.yaml
-  - ../base/desktop/desktop.yaml
-  - ../liveimage/liveimage.yaml
+  - ../live/live.yaml
+
+distro: Ultramarine Flagship 39
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+iso:
+  volume_id: UM-Fl-Live
+
+dnf:
+  releasever: 39
+  options:
+    - --setopt=strict=0
+  packages:
+    - "@ultramarine-flagship-product-enviroment"
 
 scripts:
   post:
     - id: flagship-live
       name: Set up Flagship Live
-      file: flagship-live.sh
+      file: ./flagship-live.sh

katsu/modules/gnome/gnome-live.yaml

@@ -0,0 +1,26 @@
+builder: dnf
+
+import:
+  - ../base/base.yaml
+  - ../live/live.yaml
+
+distro: Ultramarine GNOME 39
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+iso:
+  volume_id: UM-Gn-Live
+
+dnf:
+  releasever: 39
+  options:
+    - --setopt=strict=0
+  packages:
+    - "@ultramarine-gnome-product-enviroment"
+# scripts:
+#   post:
+#     - id: flagship-live
+#       name: Set up Flagship Live
+#       file: ./flagship-live.sh

katsu/modules/kde/kde-live.yaml

@@ -0,0 +1,26 @@
+builder: dnf
+
+import:
+  - ../base/base.yaml
+  - ../live/live.yaml
+
+distro: Ultramarine KDE 39
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+iso:
+  volume_id: UM-Kd-Live
+
+dnf:
+  releasever: 39
+  options:
+    - --setopt=strict=0
+  packages:
+    - "@ultramarine-kde-product-enviroment"
+# scripts:
+#   post:
+#     - id: flagship-live
+#       name: Set up Flagship Live
+#       file: ./flagship-live.sh

katsu/modules/liveimage/liveimage.yaml → katsu/modules/live/live.yaml

@@ -1,6 +1,6 @@
 scripts:
   post:
-    - id: liveimage-setup
+    - id: live-setup
       name: Set up Live Image
       file: live.sh
 dnf:

katsu/modules/pantheon/kde-live.yaml

@@ -0,0 +1,26 @@
+builder: dnf
+
+import:
+  - ../base/base.yaml
+  - ../live/live.yaml
+
+distro: Ultramarine Pantheon 39
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+iso:
+  volume_id: UM-Pa-Live
+
+dnf:
+  releasever: 39
+  options:
+    - --setopt=strict=0
+  packages:
+    - "@ultramarine-pantheon-product-enviroment"
+# scripts:
+#   post:
+#     - id: flagship-live
+#       name: Set up Flagship Live
+#       file: ./flagship-live.sh