Added related packages for wifi

.github/workflows/build-nvidia.yml

@@ -0,0 +1,44 @@
+name: bluebuild-nvidia
+on:
+  schedule:
+    - cron:
+        "00 06 * * *" # build at 06:00 UTC every day
+        # (20 minutes after last ublue images start building)
+  push:
+    branches:
+      - main
+    paths-ignore: # don't rebuild if only documentation has changed
+      - "**.md"
+  pull_request:
+  workflow_dispatch: # allow manually triggering builds
+concurrency:
+  # only run one build at a time
+  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
+  cancel-in-progress: true
+jobs:
+  bluebuild:
+    name: Build Custom Image
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+      id-token: write
+    strategy:
+      fail-fast: false # stop GH from cancelling all matrix builds if one fails
+      matrix:
+        recipe:
+          # !! Add your recipes here
+          - recipe_nvidia.yml
+    steps:
+      # the build is fully handled by the reusable github action
+      - name: Build Custom Image
+        uses: blue-build/github-action@v1.8
+        with:
+          recipe: ${{ matrix.recipe }}
+          cosign_private_key: ${{ secrets.SIGNING_SECRET }}
+          registry: 'git.hydrosaber.com'
+          registry_token: ${{ secrets.PACKAGE_BUILDER_TOKEN }}
+          pr_event_number: ${{ github.event.number }}
+
+          # enabled by default, disable if your image is small and you want faster builds
+          maximize_build_space: true

.github/workflows/build.yml

@@ -2,13 +2,17 @@ name: bluebuild
 on:
   schedule:
     - cron:
-        "00 06 * * *" # build at 06:00 UTC every Monday
+        "00 06 * * *" # build at 06:00 UTC every day
         # (20 minutes after last ublue images start building)
   push:
     branches:
       - main
     paths-ignore: # don't rebuild if only documentation has changed
       - "**.md"
+      - ".github/workflows/build-nvidia.yml"
+      - "files/scripts/nvidia/**"
+      - "recipes/components/nvidia-module.yml"
+      - "recipes/recipe_nvidia.yml"
   pull_request:
   workflow_dispatch: # allow manually triggering builds
 concurrency:
@@ -18,7 +22,7 @@ concurrency:
 jobs:
   bluebuild:
     name: Build Custom Image
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write
@@ -30,7 +34,6 @@ jobs:
           # !! Add your recipes here
           - recipe.yml
     steps:
-      
       # the build is fully handled by the reusable github action
       - name: Build Custom Image
         uses: blue-build/github-action@v1.8
@@ -42,5 +45,4 @@ jobs:
           pr_event_number: ${{ github.event.number }}
 
           # enabled by default, disable if your image is small and you want faster builds
-          maximize_build_space: "true"
-          rechunk: "true"
+          maximize_build_space: true

.gitignore

@@ -1,4 +1,3 @@
 cosign.key
 cosign.private
 /Containerfile
-/.bluebuild-scripts_*

cosign.pub

@@ -1,4 +1,4 @@
 -----BEGIN PUBLIC KEY-----
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEDgbLqIZdNv3Lx7jEKq3l6UImgXi/
-MdQ51/79s4zfI2f4wQ8ran/sZO3y91hhsImytGqfSpNZmMV8T0rmOAAXkg==
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEzzK2nfqN5MlTqBitNsehDVnITGSF
+r9FQRKI6dNDXRjlKgcMaa88Mb9FdfqFVHSPesN1mHz3/QfZIPG/s7mJAfw==
 -----END PUBLIC KEY-----

files/gschema-overrides/zz1-hydro-os-theming.gschema.override

@@ -1,4 +0,0 @@
-[org.gnome.desktop.interface]
-gtk-theme='Adwaita-dark' 
-color-scheme='prefer-dark'
-icon-theme='Papirus'

files/scripts/addimageinfo.sh

@@ -31,7 +31,7 @@ sed -i "s|^HOME_URL=.*|HOME_URL=\"$HOME_URL\"|" /usr/lib/os-release
 sed -i "s|^DOCUMENTATION_URL=.*|DOCUMENTATION_URL=\"$DOCUMENTATION_URL\"|" /usr/lib/os-release
 sed -i "s|^SUPPORT_URL=.*|SUPPORT_URL=\"$SUPPORT_URL\"|" /usr/lib/os-release
 sed -i "s|^BUG_REPORT_URL=.*|BUG_REPORT_URL=\"$BUG_SUPPORT_URL\"|" /usr/lib/os-release
-sed -i "s|^CPE_NAME=\"cpe:/o:fedoraproject:fedora|CPE_NAME=\"cpe:/o:linux:${IMAGE_PRETTY_NAME,}|" /usr/lib/os-release
+sed -i "s|^CPE_NAME=\"cpe:/o:fedoraproject:fedora|CPE_NAME=\"cpe:/o:wayblue:${IMAGE_PRETTY_NAME,}|" /usr/lib/os-release
 sed -i "s/^DEFAULT_HOSTNAME=.*/DEFAULT_HOSTNAME=\"${IMAGE_PRETTY_NAME,}\"/" /usr/lib/os-release
 sed -i "s/^ID=fedora/ID=\"${IMAGE_LIKE,}\"\nID_LIKE=\"${IMAGE_PRETTY_NAME,}\"/" /usr/lib/os-release
 sed -i "/^REDHAT_BUGZILLA_PRODUCT=/d; /^REDHAT_BUGZILLA_PRODUCT_VERSION=/d; /^REDHAT_SUPPORT_PRODUCT=/d; /^REDHAT_SUPPORT_PRODUCT_VERSION=/d" /usr/lib/os-release

files/scripts/buildakmods.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-set -oue pipefail
-
-QUALIFIED_KERNEL="$(rpm -qa | grep -P 'kernel-(\d+\.\d+\.\d+)' | sed -E 's/kernel-//')"
-
-sudo akmods --kernels $QUALIFIED_KERNEL

files/scripts/installrazermodule.sh

@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-# Tell build process to exit if there are any errors.
-set -oue pipefail
-
-echo "INFO: grab kernel module"
-KERNEL_VER="$(rpm -qa | grep -P 'kernel-(\d+\.\d+\.\d+)' | sed -E 's/kernel-//')"
-echo $KERNEL_VER
-
-echo "INFO: grab open razer modules"
-RAZER_MODULE_VER=$(ls /usr/src | grep razer | sed -E 's/(.*)-/\1\//')
-echo $RAZER_MODULE_VER
-
-echo "INFO: build and install openrazer"
-sudo dkms build -m $RAZER_MODULE_VER -k $KERNEL_VER
-sudo dkms install -m $RAZER_MODULE_VER -k $KERNEL_VER

files/scripts/installxpadneomodule.sh

@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-# Tell build process to exit if there are any errors.
-set -oue pipefail
-
-echo "INFO: grab kernel module"
-KERNEL_VER="$(rpm -qa | grep -P 'kernel-(\d+\.\d+\.\d+)' | sed -E 's/kernel-//')"
-echo $KERNEL_VER
-
-echo "INFO: grab xpad modules"
-XPAD_MODULE_VER=$(ls /usr/src | grep xpadneo |  sed 's/-/\//')
-echo $XPAD_MODULE_VER
-
-echo "INFO: build and install xpadneo"
-sudo dkms build -m $XPAD_MODULE_VER -k $KERNEL_VER
-sudo dkms install -m $XPAD_MODULE_VER -k $KERNEL_VER

files/scripts/nvidia/installtoolkitpolicy.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+# Tell build process to exit if there are any errors.
+set -oue pipefail
+
+semodule --verbose --install /usr/share/selinux/packages/nvidia-container.pp

files/scripts/nvidia/removeunusedrepos.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+# Tell build process to exit if there are any errors.
+set -oue pipefail
+
+rm -f /etc/yum.repos.d/negativo17-fedora-nvidia.repo
+rm -f /etc/yum.repos.d/negativo17-fedora-multimedia.repo
+rm -f /etc/yum.repos.d/eyecantcu-supergfxctl.repo
+rm -f /etc/yum.repos.d/_copr_ublue-os-akmods.repo
+rm -f /etc/yum.repos.d/nvidia-container-toolkit.repo

files/scripts/nvidia/setdrmvariables.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+# Tell build process to exit if there are any errors.
+set -oue pipefail
+
+
+echo '
+
+# Nvidia modesetting support. Set to 0 or comment to disable kernel modesetting
+# support. This must be disabled in case of SLI Mosaic.
+
+options nvidia-drm modeset=1 fbdev=1
+
+' > /usr/lib/modprobe.d/nvidia-modeset.conf
+
+cp /usr/lib/modprobe.d/nvidia-modeset.conf /etc/modprobe.d/nvidia-modeset.conf

files/scripts/nvidia/setearlyloading.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+# Tell build process to exit if there are any errors.
+set -oue pipefail
+
+sed -i 's@omit_drivers@force_drivers@g' /usr/lib/dracut/dracut.conf.d/99-nvidia.conf
+sed -i 's@ nvidia @ i915 amdgpu nvidia @g' /usr/lib/dracut/dracut.conf.d/99-nvidia.conf

files/scripts/regenerateinitramfs.sh

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-# Obtained from wayblue project https://github.com/wayblueorg/wayblue/blob/live/files/scripts/regenerateinitramfs.sh
-
-set -oue pipefail
-
-QUALIFIED_KERNEL="$(rpm -qa | grep -P 'kernel-(\d+\.\d+\.\d+)' | sed -E 's/kernel-//')"
-/usr/bin/dracut --no-hostonly --kver "$QUALIFIED_KERNEL" --reproducible -v --add ostree -f "/lib/modules/$QUALIFIED_KERNEL/initramfs.img"
-chmod 0600 "/lib/modules/$QUALIFIED_KERNEL/initramfs.img"

files/scripts/setupchezmoiskel.sh

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-# Tell build process to exit if there are any errors.
-set -oue pipefail
-
-git clone https://git.hydrosaber.com/eriq12/dotfiles /etc/skel/.local/share/chezmoi
-
-cp /etc/skel/.local/share/chezmoi/dot_bashrc /etc/skel/.bashrc
-cp /etc/skel/.local/share/chezmoi/dot_zshrc /etc/skel/.zshrc
-cp -r /etc/skel/.local/share/chezmoi/dot_config /etc/skel/.config

files/system/etc/environment.d/theme.conf

@@ -1,2 +0,0 @@
-QT_QPA_PLATFORMTHEME=qt6ct
-QT_QUICK_CONTROLS_STYLE=org.hyprland.style

files/system/etc/firewalld/services/grayjay.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<service>
-  <port port="12315" protocol="tcp"/>
-</service>

files/system/etc/firewalld/services/localsend.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<service>
-  <port port="53317" protocol="tcp"/>
-  <port port="53317" protocol="udp"/>
-</service>

files/system/etc/modules-load.d/asus-sensor.conf

@@ -1 +0,0 @@
-nct6775

files/system/etc/modules-load.d/ntsync.conf

@@ -1 +0,0 @@
-ntsync

files/system/etc/skel/.config/hypr/hyprland.conf.d/monitors.conf

@@ -0,0 +1,4 @@
+# monitors.conf
+
+# See https://wiki.hyprland.org/Configuring/Monitors/
+monitor=,preferred,auto,auto

files/system/etc/xdg/autostart/kitty.desktop

@@ -1,16 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=kitty
-GenericName=Terminal emulator
-Comment=Fast, feature-rich, GPU based terminal
-TryExec=kitty
-StartupNotify=true
-Exec=/usr/bin/hyprctl dispatch exec [workspace special:terminal silent] /usr/bin/kitty
-Icon=kitty
-Categories=System;TerminalEmulator;
-X-TerminalArgExec=--
-X-TerminalArgTitle=--title
-X-TerminalArgAppId=--class
-X-TerminalArgDir=--working-directory
-X-TerminalArgHold=--hold

files/system/sddm.conf.d/theme.conf

@@ -0,0 +1,2 @@
+[Theme]
+Current=maldives

files/systemd/user/discord.service

@@ -0,0 +1,17 @@
+[Unit]
+Description=The VoIP program targeted towards gaming.
+# order startup after WM
+After=graphical-session.target
+
+[Service]
+Type=exec
+# Repurpose XDG Autostart filtering
+ExecCondition=/lib/systemd/systemd-xdg-autostart-condition "wlroots:sway:Wayfire:labwc:Hyprland" ""
+ExecStart=/usr/bin/flatpak run com.discordapp.Discord
+Slice=app-graphical.slice
+
+[Install]
+WantedBy=graphical-session.target
+# Alternatively can be wanted by specific WMs' targets
+# Should also be duplicated in 'After=' to avoid ordering loop
+#WantedBy=wayland-session@hyprland.desktop.target

files/systemd/user/hyprpanel.service

@@ -1,5 +1,6 @@
 [Unit]
 Description=A panel bar branched from AGS maintained by Hyprland devs.
+Documentation=man:waybar(5)
 # order startup after WM
 After=graphical-session.target
 
@@ -7,7 +8,7 @@ After=graphical-session.target
 Type=exec
 # Repurpose XDG Autostart filtering
 ExecCondition=/lib/systemd/systemd-xdg-autostart-condition "wlroots:sway:Wayfire:labwc:Hyprland" ""
-ExecStart=/usr/bin/quickshell
+ExecStart=/usr/bin/hyprpanel
 Restart=on-failure
 Slice=app-graphical.slice
 

files/systemd/user/steam.service

@@ -0,0 +1,17 @@
+[Unit]
+Description=The pc gaming platform
+# order startup after WM
+After=graphical-session.target
+
+[Service]
+Type=exec
+# Repurpose XDG Autostart filtering
+ExecCondition=/lib/systemd/systemd-xdg-autostart-condition "wlroots:sway:Wayfire:labwc:Hyprland" ""
+ExecStart=/usr/bin/steam %U
+Slice=app-graphical.slice
+
+[Install]
+WantedBy=graphical-session.target
+# Alternatively can be wanted by specific WMs' targets
+# Should also be duplicated in 'After=' to avoid ordering loop
+#WantedBy=wayland-session@hyprland.desktop.target

files/systemd/user/terminal.service

@@ -0,0 +1,17 @@
+[Unit]
+Description=The Kitty terminal emulator.
+# order startup after WM
+After=graphical-session.target
+
+[Service]
+Type=exec
+# Repurpose XDG Autostart filtering
+ExecCondition=/lib/systemd/systemd-xdg-autostart-condition "wlroots:sway:Wayfire:labwc:Hyprland" ""
+ExecStart=hyprctl dispatch exec [workspace special:terminal silent] /usr/bin/kitty
+Slice=app-graphical.slice
+
+[Install]
+WantedBy=graphical-session.target
+# Alternatively can be wanted by specific WMs' targets
+# Should also be duplicated in 'After=' to avoid ordering loop
+#WantedBy=wayland-session@hyprland.desktop.target

files/systemd/user/unlock-kwallet.service

@@ -0,0 +1,17 @@
+[Unit]
+Description=Unlocks kwallet for hyprland on login.
+# order startup after WM
+After=graphical-session.target
+
+[Service]
+Type=exec
+# Repurpose XDG Autostart filtering
+ExecCondition=/lib/systemd/systemd-xdg-autostart-condition "wlroots:sway:Wayfire:labwc:Hyprland" ""
+ExecStart=/usr/libexec/pam_kwallet_init
+Slice=app-graphical.slice
+
+[Install]
+WantedBy=graphical-session.target
+# Alternatively can be wanted by specific WMs' targets
+# Should also be duplicated in 'After=' to avoid ordering loop
+#WantedBy=wayland-session@hyprland.desktop.target

recipes/components/autostart-module.yml

@@ -0,0 +1,10 @@
+modules:
+  - type: systemd
+    user:
+      enabled:
+        - swww.service
+        - hyprpanel.service
+        - hyprpolkitagent.service
+        - discord.service
+        - steam.service
+        - terminal.service

recipes/components/base-module.yml

@@ -0,0 +1,136 @@
+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:
+        - unlock-kwallet.service
+        - flatpak-user-update.timer
+
+  - type: dnf
+    install:
+      skip-unavailable: true
+      packages: 
+      # environment
+        # fuzzy finder
+        - fzf
+        # power profiles like
+        - tuned-ppd
+        # xwayland
+        - xorg-x11-server-Xwayland
+        # headset control
+        - headsetcontrol
+        # media related
+        - mediainfo
+        - playerctl
+        - alsa-firmware
+        # text editor
+        - neovim
+        # tools for evocation
+        - just
+        # zip utilities
+        - p7zip
+        # qt libraries
+        - qt5-qtwayland
+        - qt6-qtwayland
+        # qt ct packages
+        - qt5ct
+        - qt6ct
+        # emoji fonts
+        - google-noto-emoji-fonts
+        # vulkan
+        - vulkan-tools
+        - vulkan-validation-layers
+      
+      # dmenu runner
+        - fuzzel
+
+      # polkit
+        - polkit
+      
+      # sound
+        - wireplumber
+        - pipewire
+        - pamixer
+        - pulseaudio-utils
+      
+      # networking
+        - bluez
+        - bluez-tools
+        - firewall-config
+        - systemd-networkd
+        - NetworkManager-wifi
+      
+      # firmware
+        - iwlwifi-dvm-firmware
+        - iwlwifi-mvm-firmware
+      
+      # file manager
+        - nautilus
+        - file-roller
+        - file-roller-nautilus
+      
+      # theme and GUI
+        - fontawesome-fonts-all
+        - gnome-themes-extra
+        - gnome-icon-theme
+        - paper-icon-theme
+        - breeze-icon-theme 
+        - papirus-icon-theme
+      
+      # power
+        - powerstat
+      
+      # git
+        - git
+
+      # flatpak
+        - flatpak
+        - flatpak-selinux
+        - flatpak-session-helper
+        - flatpak-xdg-utils
+
+    remove:
+      packages:
+        # remove firefox
+        - firefox
+        - firefox-langpacks
+
+  - type: dnf
+    repos:
+      nonfree: rpmfusion
+    replace:
+      - from-repo: rpmfusion-nonfree
+        skip-unavailable: true
+        packages:
+          - libheif
+          - libva
+          - libva-intel-media-driver
+          - mesa-dri-drivers
+          - mesa-filesystem
+          - mesa-libEGL
+          - mesa-libGL
+          - mesa-libgbm
+          - mesa-libxatracker
+          - mesa-va-drivers
+          - mesa-vulkan-drivers
+          - gstreamer1-plugin-libav
+          - gstreamer1-plugin-vaapi
+          - rar
+    
+

recipes/components/cleanup-usr-etc.yml

@@ -1,5 +0,0 @@
-modules:
-  - type: script
-    snippets:
-      - "sudo cp -n -r /usr/etc /etc"
-      - "sudo rm -rf /usr/etc"

recipes/components/default-flatpak.yml

@@ -0,0 +1,12 @@
+modules:
+  - type: default-flatpaks
+    notify: true
+    system:
+      install:
+        - one.ablaze.floorp
+        - com.github.tchx84.Flatseal
+        - io.missioncenter.MissionCenter
+        - io.github.flattool.Warehouse
+    user:
+      install:
+        - com.discordapp.Discord

recipes/components/dnf-module.yml

@@ -1,9 +0,0 @@
-modules:
-  - from-file: dnf/multimedia.yml
-  - from-file: dnf/greeter.yml
-  - from-file: dnf/hyprland.yml
-  - from-file: dnf/environment.yml
-  - from-file: dnf/applications.yml
-  - from-file: dnf/vr.yml
-  - from-file: dnf/themes.yml
-  - from-file: dnf/drivers.yml

recipes/components/gschema-module.yml

@@ -1,4 +0,0 @@
-modules:
-  - type: gschema-overrides
-    include:
-      - zz1-hydro-os-theming.gschema.override

recipes/components/hyprland-module.yml

@@ -0,0 +1,11 @@
+modules:
+  - type: dnf
+    repos:
+      copr:
+        - solopasha/hyprland
+    install:
+      packages:
+        - hyprland-git
+        - hyprpanel
+        - hyprpolkitagent
+        - hyprshot

recipes/components/nvidia-module.yml

@@ -0,0 +1,16 @@
+modules:
+  - type: containerfile
+    snippets:
+      - COPY --from=ghcr.io/ublue-os/akmods-nvidia:main-42 /rpms/ /tmp/rpms
+      - RUN find /tmp/rpms
+      - RUN rpm-ostree install /tmp/rpms/ublue-os/ublue-os-nvidia*.rpm
+      - RUN sed -i '0,/enabled=0/{s/enabled=0/enabled=1/}' /etc/yum.repos.d/nvidia-container-toolkit.repo
+      - RUN sed -i '0,/enabled=0/{s/enabled=0/enabled=1\npriority=90/}' /etc/yum.repos.d/negativo17-fedora-nvidia.repo   
+      - RUN rpm-ostree install /tmp/rpms/kmods/kmod-nvidia*.rpm libnvidia-fbc libva-nvidia-driver nvidia-driver nvidia-modprobe nvidia-persistenced nvidia-settings nvidia-container-toolkit 
+    
+  - type: script
+    scripts:
+      - nvidia/installtoolkitpolicy.sh
+      - nvidia/removeunusedrepos.sh
+      - nvidia/setearlyloading.sh
+      - nvidia/setdrmvariables.sh

recipes/components/script-module.yml

@@ -1,5 +0,0 @@
-modules:
-  - type: script
-    scripts:
-      - addimageinfo.sh
-      - installohmyzsh.sh

recipes/components/sddm-module.yml

@@ -0,0 +1,26 @@
+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

recipes/components/steam-module.yml

@@ -0,0 +1,20 @@
+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

recipes/components/systemd-module.yml

@@ -1,13 +0,0 @@
-modules:
-  - type: systemd
-    system:
-      enabled:
-        - bootc-fetch-updates.timer
-        - flatpak-system-update.timer
-        - lactd.service
-    user:
-      enabled:
-        - flatpak-user-update.timer
-        - quickshell.service
-        - hyprpolkitagent.service
-        - swww.service

recipes/components/zsh-module.yml

@@ -0,0 +1,15 @@
+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

recipes/dnf/applications.yml

@@ -1,68 +0,0 @@
-modules:
-  - type: dnf
-    repos:
-      nonfree: rpmfusion
-      copr:
-        - ilyaz/LACT
-    install:
-      packages:
-      # applications
-        # fuzzy finder
-        - fzf
-      
-        # dmenu runner
-        - fuzzel
-      
-        # file manager
-        - dolphin
-        - ark
-
-        - ffmpegthumbnailer
-
-        # music / video player
-        - vlc
-
-        # text editor
-        - neovim
-
-        # kdeconnect
-        - kde-connect
-      
-      # settings apps
-        # qt
-        - qt5ct
-        - qt6ct
-
-        # gtk
-        - nwg-look
-      
-        # software store
-        - gnome-software
-
-        # disk management
-        - gnome-disk-utility
-
-        # diagnostics
-        - qdirstat
-
-        - lact
-
-        - btop
-
-      # zsh
-        - zsh
-        # zoxide for z stuff
-        - zoxide
-
-      # steam
-        - steam
-        # for game mode and big picture mode
-        - gamescope
-        # for performance view
-        - mangohud
-  
-    remove:
-      packages:
-        # remove firefox
-        - firefox
-        - firefox-langpacks

recipes/dnf/drivers.yml

@@ -1,12 +0,0 @@
-modules:
-  - type: dnf
-    repos:
-      copr:
-        - atim/xpadneo
-    install:
-      packages:
-        - xpadneo
-
-  - type: script
-    scripts:
-      - buildakmods.sh

recipes/dnf/environment.yml

@@ -1,58 +0,0 @@
-modules:
-  - type: dnf
-    repos:
-      copr:
-        - ublue-os/packages
-    install:
-      packages:
-      # ublue udev rules and signing
-        - ublue-os-udev-rules
-        - ublue-os-signing
-      
-      # environment
-        # 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
-
-        # xdg-desktop-portals
-        - xdg-desktop-portal
-        - xdg-desktop-portal-gtk
-        - xdg-desktop-portal-kde
-
-        # polkit
-        - polkit
-      
-        # sound
-        - wireplumber
-        - pipewire
-        - headsetcontrol
-      
-        # networking
-        - network-manager-applet
-        - NetworkManager
-        - NetworkManager-bluetooth
-        - NetworkManager-wifi
-        - bluez
-        - bluez-tools
-        - firewall-config
-
-        # packages for steam script
-        - lsb_release

recipes/dnf/greeter.yml

@@ -1,26 +0,0 @@
-modules:
-  - type: dnf
-    install:
-      packages:
-      # sddm
-        - sddm
-        - sddm-themes
-
-        # added libraries for quickshell
-        - qt5-qtgraphicaleffects
-        - qt5-qtimageformats
-        - qt5-qtmultimedia
-        - qt6-qtquickcontrols2
-        - qt6-qtsvg
-        - qt6-qtimageformats
-        - qt6-qtmultimedia
-        - qt6-qt5compat
-
-        # added for editing quickshell (qmlls)
-        - qt5-qtdeclarative-devel
-        - qt6-qtdeclarative-devel
-
-      # password keeper
-        - kf6-kwallet
-        - kwalletmanager
-        - pam-kwallet

recipes/dnf/hyprland.yml

@@ -1,21 +0,0 @@
-modules:
-  - type: dnf
-    repos:
-      copr:
-        - solopasha/hyprland
-        - errornointernet/quickshell
-    install:
-      packages:
-        - aquamarine
-        - hyprland-git
-        - hyprpolkitagent
-        - hyprshot
-        - hyprland-qt-support
-        - hyprland-qtutils
-        - xdg-desktop-portal-hyprland
-        - swww
-        - matugen
-        - wlogout
-
-        # quickshell
-        - quickshell-git

recipes/dnf/multimedia.yml

@@ -1,38 +0,0 @@
-modules:
-  - type: dnf
-    repos:
-      nonfree: rpmfusion
-    install:
-      packages:
-      # other multimedia
-        - gstreamer1-plugin-libav
-        - gstreamer1-plugins-bad-free-extras
-        - gstreamer1-plugins-bad-freeworld
-        - gstreamer1-plugins-ugly
-        - gstreamer1-vaapi
-  
-    remove:
-      packages:
-        # old codecs
-        - fdk-aac-free
-        - libavcodec-free
-        - libavdevice-free
-        - libavfilter-free
-        - libavformat-free
-        - libavutil-free
-        - libpostproc-free
-        - libswresample-free
-        - libswscale-free 
-        - ffmpeg-free
-
-    replace:
-      - from-repo: rpmfusion-free-updates
-        packages:
-          - old: mesa-va-drivers
-            new: mesa-va-drivers-freeworld
-    
-  - type: dnf
-    install:
-      packages:
-        - ffmpeg
-        - mesa-vdpau-drivers-freeworld

recipes/dnf/themes.yml

@@ -1,17 +0,0 @@
-modules:
-  - type: dnf
-    repos:
-      copr:
-        - peterwu/rendezvous
-    install:
-      packages:
-      # Themes and fonts
-        # emoji fonts
-        - google-noto-emoji-fonts
-      
-        # theme and GUI
-        - fontawesome-fonts-all
-        - gnome-themes-extra
-        - papirus-icon-theme
-        - bibata-cursor-themes
-        - material-icons-fonts

recipes/dnf/vr.yml

@@ -1,21 +0,0 @@
-modules:
-  - type: dnf
-    install:
-      packages:
-      # monado
-        - eigen3-devel
-        - glslang-devel
-        - glslc
-        - libbsd-devel
-        - libdrm-devel
-        - libusb1
-        - libusb1-devel
-        - libXrandr-devel
-        - mesa-libGL-devel
-        - ninja-build
-        - openxr-devel
-        - SDL2-devel
-        - wayland-devel
-        - wayland-protocols-devel
-      # wayvr dashboard
-        - webkit2gtk4.1

recipes/recipe.yml

@@ -6,18 +6,21 @@ name: hydro-os
 description: This is my personal OS image.
 
 # the base image to build on top of (FROM) and the version tag to use
-base-image: quay.io/fedora-ostree-desktops/base-atomic
-image-version: 42 # latest is also supported if you want new updates ASAP
+base-image: quay.io/fedora/fedora-bootc
+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:
-  - from-file: components/dnf-module.yml
-  - from-file: components/script-module.yml
+  - from-file: components/sddm-module.yml
+  - from-file: components/base-module.yml
   - from-file: components/sys-files-module.yml
-  - from-file: components/systemd-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/default-flatpak.yml
   - from-file: components/chezmoi-module.yml
-  - from-file: components/cleanup-usr-etc.yml
 
-  - type: signing
+  - type: signing # this sets up the proper policy & signing files for signed images to work fully
 

recipes/recipe_nvidia.yml

@@ -0,0 +1,28 @@
+---
+# yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
+# image will be published to ghcr.io/<user>/<name>
+name: hydro-os-nvidia
+# description will be included in the image's metadata
+description: This is my personal OS image.
+
+# the base image to build on top of (FROM) and the version tag to use
+base-image: quay.io/fedora/fedora-bootc
+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:
+  - from-file: components/sddm-module.yml
+  - from-file: components/base-module.yml
+  - from-file: components/nvidia-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/default-flatpak.yml
+  - from-file: components/chezmoi-module.yml
+  - type: initramfs
+
+  - type: signing # this sets up the proper policy & signing files for signed images to work fully
+