From 534aca65f755621a41e2d3c395e9f53ecf87e1d0 Mon Sep 17 00:00:00 2001 From: Eriq Taing Date: Mon, 19 May 2025 13:45:15 -0400 Subject: [PATCH] split recipe into components to be more manageable and organized --- recipes/components/default-flatpak.yml | 9 +++++++ recipes/components/hyprland-module.yml | 18 +++++++++++++ recipes/components/sddm-module.yml | 15 +++++++++++ recipes/components/sys-files-module.yml | 5 ++++ recipes/recipe.yml | 35 +++---------------------- 5 files changed, 51 insertions(+), 31 deletions(-) create mode 100644 recipes/components/default-flatpak.yml create mode 100644 recipes/components/hyprland-module.yml create mode 100644 recipes/components/sddm-module.yml create mode 100644 recipes/components/sys-files-module.yml diff --git a/recipes/components/default-flatpak.yml b/recipes/components/default-flatpak.yml new file mode 100644 index 0000000..6737ad6 --- /dev/null +++ b/recipes/components/default-flatpak.yml @@ -0,0 +1,9 @@ +modules: + - type: default-flatpaks + notify: true + system: + install: + - one.ablaze.floorp + user: + install: + - com.discordapp.Discord \ No newline at end of file diff --git a/recipes/components/hyprland-module.yml b/recipes/components/hyprland-module.yml new file mode 100644 index 0000000..8f0ac23 --- /dev/null +++ b/recipes/components/hyprland-module.yml @@ -0,0 +1,18 @@ +modules: + - type: rpm-ostree + repos: + - https://copr.fedorainfracloud.org/coprs/solopasha/hyprland/repo/fedora-%OS_VERSION%/solopasha-hyprland-fedora-%OS_VERSION%.repo + - https://copr.fedorainfracloud.org/coprs/erikreider/SwayNotificationCenter/repo/fedora-%OS_VERSION%/erikreider-SwayNotificationCenter-fedora-%OS_VERSION%.repo + install: + - hyprland-git + - hyprpanel + - neovim + - SwayNotificationCenter + - hyprpolkitagent + - hyprshot + + - type: systemd + user: + enabled: + - hyprpanel.service + - hyprpolkitagent.service \ No newline at end of file diff --git a/recipes/components/sddm-module.yml b/recipes/components/sddm-module.yml new file mode 100644 index 0000000..135aae9 --- /dev/null +++ b/recipes/components/sddm-module.yml @@ -0,0 +1,15 @@ +modules: + - type: rpm-ostree + install: + - sddm + - sddm-themes + - qt5-qtgraphicaleffects + - qt5-qtquickcontrols2 + - qt5-qtsvg + - kwallet + - pam-kwallet + + - type: systemd + system: + enabled: + - sddm-boot-patch.service \ No newline at end of file diff --git a/recipes/components/sys-files-module.yml b/recipes/components/sys-files-module.yml new file mode 100644 index 0000000..41df104 --- /dev/null +++ b/recipes/components/sys-files-module.yml @@ -0,0 +1,5 @@ +modules: + - type: files + files: + - source: system + destination: / # copies files/system/* (* means everything inside it) into your image's root folder / \ No newline at end of file diff --git a/recipes/recipe.yml b/recipes/recipe.yml index e21af3d..54f9135 100644 --- a/recipes/recipe.yml +++ b/recipes/recipe.yml @@ -12,37 +12,10 @@ image-version: latest # latest is also supported if you want new updates ASAP # module configuration, executed in order # you can include multiple instances of the same module modules: - - type: files - files: - - source: system - destination: / # copies files/system/* (* means everything inside it) into your image's root folder / - - - type: rpm-ostree - repos: - - https://copr.fedorainfracloud.org/coprs/solopasha/hyprland/repo/fedora-%OS_VERSION%/solopasha-hyprland-fedora-%OS_VERSION%.repo - - https://copr.fedorainfracloud.org/coprs/erikreider/SwayNotificationCenter/repo/fedora-%OS_VERSION%/erikreider-SwayNotificationCenter-fedora-%OS_VERSION%.repo - install: - - hyprland-git - - hyprpanel - - neovim - - SwayNotificationCenter - - hyprpolkitagent - - hyprshot - - - type: default-flatpaks - notify: true # Send notification after install/uninstall is finished (true/false) - system: - # If no repo information is specified, Flathub will be used by default - install: - - one.ablaze.floorp - - com.discordapp.Discord - user: {} # Also add Flathub user repo, but no user packages - - - type: systemd - user: - enabled: - - hyprpanel.service - - hyprpolkitagent.service + - from-file: components/sys-files-module.yml + - from-file: components/sddm-module.yml + - from-file: components/hyprland-module.yml + - from-file: components/default-flatpak.yml - type: signing # this sets up the proper policy & signing files for signed images to work fully