pull in flatpak support package

Ultramarine-Linux · Dec 17, 2024 · cd36b2b · cd36b2b
1 parent e1a968e
commit cd36b2b
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 3 deletions.
diff --git a/katsu/modules/base/base.yaml b/katsu/modules/base/base.yaml
@@ -3,9 +3,6 @@ scripts:
     - id: cleanup
       name: Clean up system
       file: cleanup.sh
-    - id: polycrystal
-      name: Install Flatpaks via Polycrystal
-      file: polycrystal.sh
     - id: selinux-setup
       name: Set up SELinux
       file: selinux.sh

diff --git a/katsu/modules/base/desktop.yaml b/katsu/modules/base/desktop.yaml
@@ -0,0 +1,11 @@
+scripts:
+  post:
+    - id: polycrystal
+      name: Install Flatpaks via Polycrystal
+      file: polycrystal.sh
+
+dnf:
+  releasever: 41
+  exec: dnf4
+  packages:
+    - "@default-flatpak-support"
diff --git a/katsu/modules/flagship/base-disk-aarch64.yaml b/katsu/modules/flagship/base-disk-aarch64.yaml
@@ -11,6 +11,7 @@ distro: Ultramarine Linux 41 (Flagship Edition)
 import:
   - ../base/base.yaml
   - ../base/base-disk.yaml
+  - ../base/desktop.yaml
   - flagship.yaml
 
 scripts:

diff --git a/katsu/modules/flagship/base-disk-x86_64.yaml b/katsu/modules/flagship/base-disk-x86_64.yaml
@@ -11,6 +11,7 @@ distro: Ultramarine Linux 41 (Flagship Edition)
 import:
   - ../base/base.yaml
   - ../base/base-disk.yaml
+  - ../base/desktop.yaml
   - flagship.yaml
 
 scripts:

diff --git a/katsu/modules/flagship/flagship-live.yaml b/katsu/modules/flagship/flagship-live.yaml
@@ -3,6 +3,7 @@ builder: dnf
 import:
   - ../base/base.yaml
   - ../live/live.yaml
+  - ../base/desktop.yaml
   - flagship.yaml
 
 distro: Ultramarine Linux 41 (Flagship Edition)

diff --git a/katsu/modules/gnome/base-disk-aarch64.yaml b/katsu/modules/gnome/base-disk-aarch64.yaml
@@ -11,6 +11,7 @@ distro: Ultramarine Linux 41 (GNOME Edition)
 import:
   - ../base/base.yaml
   - ../base/base-disk.yaml
+  - ../base/desktop.yaml
   - gnome.yaml
 
 scripts:

diff --git a/katsu/modules/gnome/base-disk-x86_64.yaml b/katsu/modules/gnome/base-disk-x86_64.yaml
@@ -11,6 +11,7 @@ distro: Ultramarine Linux 41 (GNOME Edition)
 import:
   - ../base/base.yaml
   - ../base/base-disk.yaml
+  - ../base/desktop.yaml
   - gnome.yaml
 
 scripts:

diff --git a/katsu/modules/gnome/gnome-live.yaml b/katsu/modules/gnome/gnome-live.yaml
@@ -3,6 +3,7 @@ builder: dnf
 import:
   - ../base/base.yaml
   - ../live/live.yaml
+  - ../base/desktop.yaml
   - gnome.yaml
 
 distro: Ultramarine GNOME 41

diff --git a/katsu/modules/plasma/base-disk-aarch64.yaml b/katsu/modules/plasma/base-disk-aarch64.yaml
@@ -11,6 +11,7 @@ distro: Ultramarine Linux 41 (Plasma Edition)
 import:
   - ../base/base.yaml
   - ../base/base-disk.yaml
+  - ../base/desktop.yaml
   - plasma.yaml
   - plasma-disk.yaml
 

diff --git a/katsu/modules/plasma/base-disk-x86_64.yaml b/katsu/modules/plasma/base-disk-x86_64.yaml
@@ -11,6 +11,7 @@ distro: Ultramarine Linux 41 (Plasma Edition)
 import:
   - ../base/base.yaml
   - ../base/base-disk.yaml
+  - ../base/desktop.yaml
   - plasma.yaml
   - plasma-disk.yaml
 

diff --git a/katsu/modules/plasma/plasma-live.yaml b/katsu/modules/plasma/plasma-live.yaml
@@ -3,6 +3,7 @@ builder: dnf
 import:
   - ../base/base.yaml
   - ../live/live.yaml
+  - ../base/desktop.yaml
   - plasma.yaml
 
 distro: Ultramarine Linux 41 (Plasma Edition)

diff --git a/katsu/modules/xfce/base-disk-aarch64.yaml b/katsu/modules/xfce/base-disk-aarch64.yaml
@@ -11,6 +11,7 @@ distro: Ultramarine Linux 41 (Xfce Edition)
 import:
   - ../base/base.yaml
   - ../base/base-disk.yaml
+  - ../base/desktop.yaml
   - xfce.yaml
 
 scripts:

diff --git a/katsu/modules/xfce/base-disk-x86_64.yaml b/katsu/modules/xfce/base-disk-x86_64.yaml
@@ -11,6 +11,7 @@ distro: Ultramarine Linux 41 (Xfce Edition)
 import:
   - ../base/base.yaml
   - ../base/base-disk.yaml
+  - ../base/desktop.yaml
   - xfce.yaml
 
 scripts:

diff --git a/katsu/modules/xfce/xfce-live.yaml b/katsu/modules/xfce/xfce-live.yaml
@@ -3,6 +3,7 @@ builder: dnf
 import:
   - ../base/base.yaml
   - ../live/live.yaml
+  - ../base/desktop.yaml
   - xfce.yaml
 
 distro: Ultramarine Linux 41 (Xfce Edition)