adding base-module ading udev rules and other things from ublue

README.md

@@ -26,4 +26,9 @@ To rebase an existing atomic Fedora installation to the latest build:
   systemctl reboot
   ```
 
-The `latest` tag will automatically point to the latest build. That build will still always use the Fedora version specified in `recipe.yml`, so you won't get accidentally updated to the next major version.
+The `latest` tag will automatically point to the latest build. That build will still always use the Fedora version specified in `recipe.yml`, so you won't get accidentally updated to the next major version.
+
+
+# Attribution
+
+Thanks to [Wayblue](https://github.com/wayblueorg/wayblue) for how to get around some issues with sddm on an atomic distribution and how to create a working distro from the base Fedora image.

files/system/etc/sddm/sddm-useradd

@@ -0,0 +1,4 @@
+#!/usr/bin/sh
+
+getent group sddm > /dev/null || groupadd -r sddm
+getent passwd sddm > /dev/null || useradd -r -g sddm -c "SDDM Greeter Account" -d /var/lib/sddm -s /usr/sbin/nologin sddm

files/systemd/system/sddm-boot-patch.service

@@ -0,0 +1,18 @@
+# Taken from Wayblue's repo, https://github.com/wayblueorg/wayblue
+# This is to resolve issue on boot for sddm login
+# Creates an SDDM user before SDDM runs.
+# See:
+# 	- https://github.com/ublue-os/cinnamon/blob/bf44562ddbed670cdd0d03a45ea08bdb8a6e96a7/system_files/usr/lib/systemd/system/ublue-lightdm-workaround.service#L4
+# 	- https://github.com/ublue-os/main/issues/224#issuecomment-1987851271
+
+[Unit]
+Description=Create SDDM user on system boot
+Before=sddm.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/etc/sddm/sddm-useradd
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target

recipes/components/base-module.yml

@@ -0,0 +1,25 @@
+modules:
+  - type: containerfile
+    snippets:
+      - RUN rpm-ostree install just powerstat
+      - 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 /
+      - COPY --from=ghcr.io/ublue-os/config:latest /rpms/ublue-os-luks.noarch.rpm /
+      - COPY --from=ghcr.io/ublue-os/config:latest /rpms/ublue-os-just.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
+      - RUN rpm -ivh /ublue-os-luks.noarch.rpm
+      - RUN rpm -ivh /ublue-os-just.noarch.rpm
+  
+  - type: systemd
+    system:
+      enabled:
+        - rpm-ostreed.automatic.timer
+        - podman-auto-update.timer
+        - flatpak-system-update.timer
+    user:
+      enabled:
+        - podman-auto-update.timer
+        - flatpak-system-update.timer

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

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

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

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 /

recipes/recipe.yml

@@ -12,37 +12,11 @@ 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
+  - from-file: components/sys-files-module.yml
-    files:
+  - from-file: components/base-module.yml
-      - source: system
+  - from-file: components/sddm-module.yml
-        destination: / # copies files/system/* (* means everything inside it) into your image's root folder /
+  - from-file: components/hyprland-module.yml
-
+  - from-file: components/default-flatpak.yml
-  - 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
 
   - type: signing # this sets up the proper policy & signing files for signed images to work fully