From d44297ebafae7daa8b74a4644bd1f7ffe4682735 Mon Sep 17 00:00:00 2001 From: Eriq Taing Date: Thu, 19 Jun 2025 01:39:29 -0400 Subject: [PATCH] Consolidated every multiple instances of modules into one call per type --- recipes/components/appearance-module.yml | 33 ---- recipes/components/autostart-module.yml | 7 - .../components/base-applications-module.yml | 27 --- recipes/components/core-module.yml | 88 ---------- recipes/components/default-flatpak.yml | 3 +- recipes/components/dnf-module.yml | 160 ++++++++++++++++++ recipes/components/gschema-module.yml | 4 + recipes/components/hyprland-module.yml | 11 -- recipes/components/script-module.yml | 5 + recipes/components/sddm-module.yml | 26 --- recipes/components/steam-module.yml | 20 --- recipes/components/systemd-module.yml | 12 ++ recipes/components/zsh-module.yml | 15 -- recipes/recipe.yml | 11 +- recipes/recipe_nvidia.yml | 13 +- 15 files changed, 190 insertions(+), 245 deletions(-) delete mode 100644 recipes/components/appearance-module.yml delete mode 100644 recipes/components/autostart-module.yml delete mode 100644 recipes/components/base-applications-module.yml delete mode 100644 recipes/components/core-module.yml create mode 100644 recipes/components/dnf-module.yml create mode 100644 recipes/components/gschema-module.yml delete mode 100644 recipes/components/hyprland-module.yml create mode 100644 recipes/components/script-module.yml delete mode 100644 recipes/components/sddm-module.yml delete mode 100644 recipes/components/steam-module.yml create mode 100644 recipes/components/systemd-module.yml delete mode 100644 recipes/components/zsh-module.yml diff --git a/recipes/components/appearance-module.yml b/recipes/components/appearance-module.yml deleted file mode 100644 index d0bb8fd..0000000 --- a/recipes/components/appearance-module.yml +++ /dev/null @@ -1,33 +0,0 @@ -modules: - - type: dnf - repos: - copr: - - peterwu/rendezvous - - solopasha/hyprland - install: - skip-unavailable: true - packages: - # settings apps - # qt - - qt5ct - - qt6ct - - # gtk - - nwg-look - - # Themes and fonts - # emoji fonts - - google-noto-emoji-fonts - - # theme and GUI - - fontawesome-fonts-all - - gnome-themes-extra - - gnome-icon-theme - - paper-icon-theme - - breeze-icon-theme - - papirus-icon-theme - - bibata-cursor-themes - - - type: gschema-overrides - include: - - zz1-hydro-os-theming.gschema.override \ No newline at end of file diff --git a/recipes/components/autostart-module.yml b/recipes/components/autostart-module.yml deleted file mode 100644 index a0e847a..0000000 --- a/recipes/components/autostart-module.yml +++ /dev/null @@ -1,7 +0,0 @@ -modules: - - type: systemd - user: - enabled: - - swww.service - - hyprpanel.service - - hyprpolkitagent.service \ No newline at end of file diff --git a/recipes/components/base-applications-module.yml b/recipes/components/base-applications-module.yml deleted file mode 100644 index 023b21f..0000000 --- a/recipes/components/base-applications-module.yml +++ /dev/null @@ -1,27 +0,0 @@ -modules: - - type: dnf - install: - skip-unavailable: true - packages: - # fuzzy finder - - fzf - - # dmenu runner - - fuzzel - - # file manager - - nautilus - - file-roller - - file-roller-nautilus - - # text editor - - neovim - - # software store - - gnome-software - - # disk management - - gnome-disk-utility - - # kdeconnect - - kde-connect \ No newline at end of file diff --git a/recipes/components/core-module.yml b/recipes/components/core-module.yml deleted file mode 100644 index a58b7cb..0000000 --- a/recipes/components/core-module.yml +++ /dev/null @@ -1,88 +0,0 @@ -modules: - - type: dnf - repos: - copr: - - ublue-os/packages - install: - packages: - - ublue-os-udev-rules - - ublue-os-signing - - - type: script - scripts: - - addimageinfo.sh - - - type: systemd - system: - enabled: - - bootc-fetch-updates.timer - - flatpak-system-update.timer - user: - enabled: - - flatpak-user-update.timer - - - type: dnf - install: - packages: - # environment - # power profiles like - - tuned-ppd - # xwayland - - xorg-x11-server-Xwayland - # headset control - - headsetcontrol - # media related - - mediainfo - - playerctl - - alsa-firmware - # zip utilities - - p7zip - # qt libraries - - qt5-qtwayland - - qt6-qtwayland - # vulkan - - vulkan-tools - - vulkan-validation-layers - - # polkit - - polkit - - # sound - - wireplumber - - pipewire - - pamixer - - pulseaudio-utils - - # networking - - bluez - - bluez-tools - - firewall-config - - # power - - powerstat - - remove: - packages: - # remove firefox - - firefox - - firefox-langpacks - - - type: dnf - repos: - nonfree: rpmfusion - replace: - - from-repo: rpmfusion-nonfree - packages: - - libheif - - libva - - libva-intel-media-driver - - mesa-dri-drivers - - mesa-filesystem - - mesa-libEGL - - mesa-libGL - - mesa-libgbm - - mesa-va-drivers - - mesa-vulkan-drivers - - gstreamer1-plugin-libav - - diff --git a/recipes/components/default-flatpak.yml b/recipes/components/default-flatpak.yml index e528711..da6fc3a 100644 --- a/recipes/components/default-flatpak.yml +++ b/recipes/components/default-flatpak.yml @@ -3,10 +3,11 @@ modules: notify: true system: install: - - one.ablaze.floorp - com.github.tchx84.Flatseal - io.missioncenter.MissionCenter - io.github.flattool.Ignition + - net.davidotek.pupgui2 user: install: + - one.ablaze.floorp - com.discordapp.Discord \ No newline at end of file diff --git a/recipes/components/dnf-module.yml b/recipes/components/dnf-module.yml new file mode 100644 index 0000000..11c675b --- /dev/null +++ b/recipes/components/dnf-module.yml @@ -0,0 +1,160 @@ +modules: + - type: dnf + repos: + copr: + - ublue-os/packages + - solopasha/hyprland + - atim/xpadneo + - peterwu/rendezvous + nonfree: rpmfusion + install: + skip-unavailable: true + packages: + # sddm + - sddm + - sddm-themes + - qt5-qtgraphicaleffects + - qt5-qtquickcontrols2 + - qt5-qtsvg + + # password keeper + - kf6-kwallet + - kwalletmanager + - pam-kwallet + + # signon + - signon + - signon-kwallet-extension + - signon-plugin-oauth2 + - signon-qt5 + - signon-qt6 + - signon-ui + + # hyprland + - hyprland-git + - hyprpanel + - hyprpolkitagent + - hyprshot + + # ublue udev rules and signing + - ublue-os-udev-rules + - ublue-os-signing + + # environment + # power profiles like + - tuned-ppd + # xwayland + - xorg-x11-server-Xwayland + # headset control + - headsetcontrol + # media related + - mediainfo + - playerctl + - alsa-firmware + # zip utilities + - p7zip + # qt libraries + - qt5-qtwayland + - qt6-qtwayland + # vulkan + - vulkan-tools + - vulkan-validation-layers + + # polkit + - polkit + + # sound + - wireplumber + - pipewire + - pamixer + - pulseaudio-utils + + # networking + - bluez + - bluez-tools + - firewall-config + + # power + - powerstat + + # applications + # fuzzy finder + - fzf + + # dmenu runner + - fuzzel + + # file manager + - nautilus + - file-roller + - file-roller-nautilus + + # text editor + - neovim + + # software store + - gnome-software + + # disk management + - gnome-disk-utility + + # kdeconnect + - kde-connect + + # settings apps + # qt + - qt5ct + - qt6ct + + # gtk + - nwg-look + + # Themes and fonts + # emoji fonts + - google-noto-emoji-fonts + + # theme and GUI + - fontawesome-fonts-all + - gnome-themes-extra + - gnome-icon-theme + - paper-icon-theme + - breeze-icon-theme + - papirus-icon-theme + - bibata-cursor-themes + + # zsh + - zsh + # sqlite for some autocomplete + - sqlite + # zoxide for z stuff + - zoxide + + # steam + - steam + # for game mode and big picture mode + - gamescope + # for performance view + - mangohud + # controller + - xpadneo + + remove: + packages: + # remove firefox + - firefox + - firefox-langpacks + + replace: + - from-repo: rpmfusion-nonfree + packages: + - libheif + - libva + - libva-intel-media-driver + - mesa-dri-drivers + - mesa-filesystem + - mesa-libEGL + - mesa-libGL + - mesa-libgbm + - mesa-va-drivers + - mesa-vulkan-drivers + - gstreamer1-plugin-libav \ No newline at end of file diff --git a/recipes/components/gschema-module.yml b/recipes/components/gschema-module.yml new file mode 100644 index 0000000..ee849d6 --- /dev/null +++ b/recipes/components/gschema-module.yml @@ -0,0 +1,4 @@ +modules: + - type: gschema-overrides + include: + - zz1-hydro-os-theming.gschema.override \ No newline at end of file diff --git a/recipes/components/hyprland-module.yml b/recipes/components/hyprland-module.yml deleted file mode 100644 index 6ab195d..0000000 --- a/recipes/components/hyprland-module.yml +++ /dev/null @@ -1,11 +0,0 @@ -modules: - - type: dnf - repos: - copr: - - solopasha/hyprland - install: - packages: - - hyprland-git - - hyprpanel - - hyprpolkitagent - - hyprshot \ No newline at end of file diff --git a/recipes/components/script-module.yml b/recipes/components/script-module.yml new file mode 100644 index 0000000..e206273 --- /dev/null +++ b/recipes/components/script-module.yml @@ -0,0 +1,5 @@ +modules: + - type: script + scripts: + - addimageinfo.sh + - installohmyzsh.sh \ No newline at end of file diff --git a/recipes/components/sddm-module.yml b/recipes/components/sddm-module.yml deleted file mode 100644 index 8cd02e0..0000000 --- a/recipes/components/sddm-module.yml +++ /dev/null @@ -1,26 +0,0 @@ -modules: - - type: dnf - install: - packages: - - sddm - - sddm-themes - - qt5-qtgraphicaleffects - - qt5-qtquickcontrols2 - - qt5-qtsvg - - # password keeper - - kf6-kwallet - - kwalletmanager - - pam-kwallet - - # signon - - signon - - signon-kwallet-extension - - signon-plugin-oauth2 - - signon-qt5 - - signon-qt6 - - signon-ui - - - type: script - scripts: - - setsddmtheming.sh \ No newline at end of file diff --git a/recipes/components/steam-module.yml b/recipes/components/steam-module.yml deleted file mode 100644 index 121589f..0000000 --- a/recipes/components/steam-module.yml +++ /dev/null @@ -1,20 +0,0 @@ -modules: - - type: dnf - repos: - nonfree: rpmfusion - copr: - enable: - - atim/xpadneo - install: - packages: - - steam - # for game mode and big picture mode - - gamescope - # for performance view - - mangohud - - xpadneo - - - type: default-flatpaks - system: - install: - - net.davidotek.pupgui2 \ No newline at end of file diff --git a/recipes/components/systemd-module.yml b/recipes/components/systemd-module.yml new file mode 100644 index 0000000..46c2e3e --- /dev/null +++ b/recipes/components/systemd-module.yml @@ -0,0 +1,12 @@ +modules: + - type: systemd + system: + enabled: + - bootc-fetch-updates.timer + - flatpak-system-update.timer + user: + enabled: + - flatpak-user-update.timer + - swww.service + - hyprpanel.service + - hyprpolkitagent.service \ No newline at end of file diff --git a/recipes/components/zsh-module.yml b/recipes/components/zsh-module.yml deleted file mode 100644 index b504763..0000000 --- a/recipes/components/zsh-module.yml +++ /dev/null @@ -1,15 +0,0 @@ -modules: - - type: dnf - install: - packages: - # zsh - - zsh - # sqlite for some autocomplete - - sqlite - # zoxide for z stuff - - zoxide - - # install oh my zsh - - type: script - scripts: - - installohmyzsh.sh \ No newline at end of file diff --git a/recipes/recipe.yml b/recipes/recipe.yml index 2f3b144..7042d1c 100644 --- a/recipes/recipe.yml +++ b/recipes/recipe.yml @@ -12,15 +12,10 @@ image-version: 42 # 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: - - from-file: components/sddm-module.yml - - from-file: components/core-module.yml - - from-file: components/base-applications-module.yml - - from-file: components/appearance-module.yml + - from-file: components/dnf-module.yml + - from-file: components/script-module.yml - from-file: components/sys-files-module.yml - - from-file: components/hyprland-module.yml - - from-file: components/zsh-module.yml - - from-file: components/steam-module.yml - - from-file: components/autostart-module.yml + - from-file: components/systemd-module.yml - from-file: components/default-flatpak.yml - from-file: components/chezmoi-module.yml diff --git a/recipes/recipe_nvidia.yml b/recipes/recipe_nvidia.yml index 6352ef1..bb4008e 100644 --- a/recipes/recipe_nvidia.yml +++ b/recipes/recipe_nvidia.yml @@ -12,16 +12,11 @@ image-version: 42 # 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: - - from-file: components/sddm-module.yml - - from-file: components/core-module.yml - - from-file: components/base-applications-module.yml - - from-file: components/appearance-module.yml - - from-file: components/nvidia-module.yml + - from-file: components/dnf-module.yml + - from-file: components/script-module.yml - from-file: components/sys-files-module.yml - - from-file: components/hyprland-module.yml - - from-file: components/zsh-module.yml - - from-file: components/steam-module.yml - - from-file: components/autostart-module.yml + - from-file: components/systemd-module.yml + - from-file: components/nvidia-module.yml - from-file: components/default-flatpak.yml - from-file: components/chezmoi-module.yml - type: initramfs -- 2.39.5