2025-06-19 02:03:13 -04:00
15 changed files with 190 additions and 245 deletions
--- a/recipes/components/appearance-module.yml
+++ b/recipes/components/appearance-module.yml
@@ -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
--- a/recipes/components/autostart-module.yml
+++ b/recipes/components/autostart-module.yml
@@ -1,7 +0,0 @@
-modules:
-  - type: systemd
-    user:
-      enabled:
-        - swww.service
-        - hyprpanel.service
-        - hyprpolkitagent.service
--- a/recipes/components/base-applications-module.yml
+++ b/recipes/components/base-applications-module.yml
@@ -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
--- a/recipes/components/core-module.yml
+++ b/recipes/components/core-module.yml
@@ -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
-    
-
--- 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
--- a/recipes/components/dnf-module.yml
+++ 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
--- a/recipes/components/gschema-module.yml
+++ b/recipes/components/gschema-module.yml
@@ -0,0 +1,4 @@
+modules:
+  - type: gschema-overrides
+    include:
+      - zz1-hydro-os-theming.gschema.override
--- a/recipes/components/hyprland-module.yml
+++ b/recipes/components/hyprland-module.yml
@@ -1,11 +0,0 @@
-modules:
-  - type: dnf
-    repos:
-      copr:
-        - solopasha/hyprland
-    install:
-      packages:
-        - hyprland-git
-        - hyprpanel
-        - hyprpolkitagent
-        - hyprshot
--- a/recipes/components/script-module.yml
+++ b/recipes/components/script-module.yml
@@ -0,0 +1,5 @@
+modules:
+  - type: script
+    scripts:
+      - addimageinfo.sh
+      - installohmyzsh.sh
--- a/recipes/components/sddm-module.yml
+++ b/recipes/components/sddm-module.yml
@@ -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
--- a/recipes/components/steam-module.yml
+++ b/recipes/components/steam-module.yml
@@ -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
--- a/recipes/components/systemd-module.yml
+++ 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
--- a/recipes/components/zsh-module.yml
+++ b/recipes/components/zsh-module.yml
@@ -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
--- 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

--- 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