files/scripts/enableautoupdates.sh

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-# Tell build process to exit if there are any errors.
-set -oue pipefail
-
-systemctl enable rpm-ostreed-automatic.timer
-systemctl enable podman-auto-update.timer
-systemctl --global enable podman-auto-update.timer
-systemctl --global enable flatpak-user-update.timer
-systemctl enable flatpak-system-update.timer

files/scripts/installproprietarypackages.sh

@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Tell build process to exit if there are any errors.
-set -oue pipefail
-
-curl -Lo /etc/yum.repos.d/negativo17-fedora-multimedia.repo https://negativo17.org/repos/fedora-multimedia.repo
-sed -i '0,/enabled=1/{s/enabled=1/enabled=1\npriority=90/}' /etc/yum.repos.d/negativo17-fedora-multimedia.repo
-
-rpm-ostree override replace \
-  --experimental \
-  --from repo='fedora-multimedia' \
-    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

files/systemd/user/discord.service

@@ -1,5 +1,5 @@
 [Unit]
-Description=The pc gaming platform
+Description=The VoIP program targeted towards gaming.
 # order startup after WM
 After=graphical-session.target
 

files/systemd/user/floorp.service

@@ -1,17 +0,0 @@
-[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/flatpak run one.ablaze.floorp
-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

@@ -1,5 +1,5 @@
 [Unit]
-Description=The pc gaming platform
+Description=The Kitty terminal emulator.
 # order startup after WM
 After=graphical-session.target
 

recipes/components/autostart-module.yml

@@ -5,6 +5,5 @@ modules:
         - hyprpanel.service
         - hyprpolkitagent.service
         - discord.service
-        - floorp.service
         - steam.service
         - terminal.service

recipes/components/base-module.yml

@@ -1,21 +1,26 @@
 modules:
-  - type: containerfile
-    snippets:
-      - COPY --from=ghcr.io/ublue-os/config:latest /rpms/ublue-os-udev-rules.noarch.rpm /
-      - COPY --from=ghcr.io/ublue-os/config:latest /rpms/ublue-os-update-services.noarch.rpm /
-      - COPY --from=ghcr.io/ublue-os/config:latest /rpms/ublue-os-signing.noarch.rpm /
-      - RUN rpm -ivh /ublue-os-udev-rules.noarch.rpm
-      - RUN rpm -ivh /ublue-os-update-services.noarch.rpm
-      - RUN rpm -ivh /ublue-os-signing.noarch.rpm
-  
-  - type: script
-    scripts:
-      - enableautoupdates.sh # using systemd did not work, so using this script instead
-  
   - type: dnf
     repos:
       copr:
-        - erikreider/SwayNotificationCenter
+        - ublue-os/packages
+    install:
+      packages:
+        - ublue-os-udev-rules
+        - ublue-os-update-services
+        - ublue-os-signing
+  
+  - type: systemd
+    system:
+      enabled:
+        - rpm-ostreed-automatic.timer
+        - podman-auto-update.timer
+        - flatpak-system-update.timer
+    user:
+      enabled:
+        - podman-auto-update.timer
+        - flatpak-user-update.timer
+  
+  - type: dnf
     install:
       packages: 
       # environment
@@ -31,8 +36,6 @@ modules:
         - mediainfo
         - playerctl
         - alsa-firmware
-        # nofitications
-        - SwayNotificationCenter
         # text editor
         - neovim
         # tools for evocation
@@ -66,8 +69,6 @@ modules:
         - nautilus
         - file-roller
         - file-roller-nautilus
-        - nextcloud-client
-        - nextcloud-client-nautilus
       
       # theme and GUI
         - fontawesome-fonts-all
@@ -79,7 +80,6 @@ modules:
       
       # software
         - gnome-software
-        - gnome-software-rpm-ostree
       
       # power
         - powerstat
@@ -90,7 +90,22 @@ modules:
         - firefox
         - firefox-langpacks
 
-  - type: script
+  - type: dnf
-    scripts:
+    repos:
-      - installproprietarypackages.sh
+      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
+    
 

recipes/components/nvidia-module.yml

@@ -6,10 +6,11 @@ modules:
       - 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-driver-cuda nvidia-modprobe nvidia-persistenced nvidia-settings nvidia-container-toolkit 
+      - 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
+      - nvidia/setdrmvariables.sh