From 873a0bce81ff03d632597d220998918553a69dd9 Mon Sep 17 00:00:00 2001 From: Gerald Pinder Date: Thu, 11 Sep 2025 22:38:16 -0400 Subject: [PATCH] Base off of kinoite for combo --- recipes/base-combo-nvidia.yml | 8 +------- recipes/base-combo.yml | 8 +------- recipes/base-cosmic-nvidia.yml | 3 ++- recipes/base-cosmic.yml | 3 ++- recipes/base-kinoite-nvidia.yml | 4 ++-- recipes/base-kinoite.yml | 4 ++-- recipes/base/cosmic-greeter.yml | 6 ++++++ recipes/base/cosmic.yml | 6 ------ recipes/base/kinoite.yml | 7 ------- 9 files changed, 16 insertions(+), 33 deletions(-) create mode 100644 recipes/base/cosmic-greeter.yml diff --git a/recipes/base-combo-nvidia.yml b/recipes/base-combo-nvidia.yml index f585a7a..a8482ff 100644 --- a/recipes/base-combo-nvidia.yml +++ b/recipes/base-combo-nvidia.yml @@ -1,18 +1,12 @@ --- # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json name: combo-nvidia -base-image: quay.io/fedora-ostree-desktops/base-atomic +base-image: quay.io/fedora-ostree-desktops/kinoite image-version: 42 description: The base image of Wunker OS with COSMIC and Plasma for Nvidia modules: - from-file: base/common.yml - from-file: base/cosmic.yml - from-file: base/kinoite.yml - - type: systemd - system: - enabled: - - sddm - disabled: - - cosmic-greeter - from-file: base/nvidia.yml - from-file: base/post-build.yml diff --git a/recipes/base-combo.yml b/recipes/base-combo.yml index 17de23c..d771c26 100644 --- a/recipes/base-combo.yml +++ b/recipes/base-combo.yml @@ -1,17 +1,11 @@ --- # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json name: combo -base-image: quay.io/fedora-ostree-desktops/base-atomic +base-image: quay.io/fedora-ostree-desktops/kinoite image-version: 42 description: The base image of Wunker OS with COSMIC and Plasma modules: - from-file: base/common.yml - from-file: base/cosmic.yml - from-file: base/kinoite.yml - - type: systemd - system: - enabled: - - sddm - disabled: - - cosmic-greeter - from-file: base/post-build.yml diff --git a/recipes/base-cosmic-nvidia.yml b/recipes/base-cosmic-nvidia.yml index 7ec8ae1..144787b 100644 --- a/recipes/base-cosmic-nvidia.yml +++ b/recipes/base-cosmic-nvidia.yml @@ -3,9 +3,10 @@ name: cosmic-nvidia base-image: quay.io/fedora-ostree-desktops/base-atomic image-version: 42 -description: The base image of Wunker OS +description: The base image of Wunker OS with COSMIC for Nvidia modules: - from-file: base/common.yml - from-file: base/cosmic.yml + - from-file: base/cosmic-greeter.yml - from-file: base/nvidia.yml - from-file: base/post-build.yml diff --git a/recipes/base-cosmic.yml b/recipes/base-cosmic.yml index 38f8615..0ffa9e2 100644 --- a/recipes/base-cosmic.yml +++ b/recipes/base-cosmic.yml @@ -3,8 +3,9 @@ name: cosmic base-image: quay.io/fedora-ostree-desktops/base-atomic image-version: 42 -description: The base image of Wunker OS +description: The base image of Wunker OS with COSMIC modules: - from-file: base/common.yml - from-file: base/cosmic.yml + - from-file: base/cosmic-greeter.yml - from-file: base/post-build.yml diff --git a/recipes/base-kinoite-nvidia.yml b/recipes/base-kinoite-nvidia.yml index cf1137a..2c7e605 100644 --- a/recipes/base-kinoite-nvidia.yml +++ b/recipes/base-kinoite-nvidia.yml @@ -1,9 +1,9 @@ --- # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json name: kinoite-nvidia -base-image: quay.io/fedora-ostree-desktops/base-atomic +base-image: quay.io/fedora-ostree-desktops/kinoite image-version: 42 -description: The base image of Wunker OS +description: The base image of Wunker OS with Plasma for Nvidia modules: - from-file: base/common.yml - from-file: base/kinoite.yml diff --git a/recipes/base-kinoite.yml b/recipes/base-kinoite.yml index e4847a2..0d67cd5 100644 --- a/recipes/base-kinoite.yml +++ b/recipes/base-kinoite.yml @@ -1,9 +1,9 @@ --- # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json name: kinoite -base-image: quay.io/fedora-ostree-desktops/base-atomic +base-image: quay.io/fedora-ostree-desktops/kinoite image-version: 42 -description: The base image of Wunker OS +description: The base image of Wunker OS with Plasma modules: - from-file: base/common.yml - from-file: base/kinoite.yml diff --git a/recipes/base/cosmic-greeter.yml b/recipes/base/cosmic-greeter.yml new file mode 100644 index 0000000..b49fa9a --- /dev/null +++ b/recipes/base/cosmic-greeter.yml @@ -0,0 +1,6 @@ +modules: + # Setup cosmic greeter as DM + - type: systemd + system: + enabled: + - cosmic-greeter diff --git a/recipes/base/cosmic.yml b/recipes/base/cosmic.yml index 171fda3..47a0539 100644 --- a/recipes/base/cosmic.yml +++ b/recipes/base/cosmic.yml @@ -14,9 +14,3 @@ modules: # group-install: # packages: # - cosmic-desktop-environment - - # Setup cosmic greeter as DM - - type: systemd - system: - enabled: - - cosmic-greeter diff --git a/recipes/base/kinoite.yml b/recipes/base/kinoite.yml index b09ffa7..ab1c01c 100644 --- a/recipes/base/kinoite.yml +++ b/recipes/base/kinoite.yml @@ -1,8 +1,5 @@ modules: - type: dnf - group-install: - packages: - - kde-desktop install: packages: - fcitx5-qt @@ -28,7 +25,3 @@ modules: - type: script snippets: - dnf5 versionlock add "qt6-*" - - type: systemd - system: - enabled: - - sddm