formatting changes

lenuswalker · Aug 17, 2024 · 1f3142e · 1f3142e
1 parent 0be383b
commit 1f3142e
Show file tree

Hide file tree

Showing 18 changed files with 31 additions and 120 deletions.
diff --git a/recipes/common-packages-rawhide.yml b/recipes/common-packages-rawhide.yml
diff --git a/recipes/cosmic-desktop-packages.yml b/recipes/cosmic-desktop-packages.yml
@@ -0,0 +1,3 @@
+type: rpm-ostree
+install:
+  - cosmic-desktop
diff --git a/recipes/cosmic-desktop-rawhide.yml b/recipes/cosmic-desktop-rawhide.yml
diff --git a/recipes/cosmic-desktop.yml → recipes/cosmic-desktop-repo.yml b/recipes/cosmic-desktop.yml → recipes/cosmic-desktop-repo.yml
@@ -1,7 +1,3 @@
 type: script
 snippets:
-  - wget https://copr.fedorainfracloud.org/coprs/ryanabx/cosmic-epoch/repo/fedora-$(rpm -E %fedora)/ryanabx-cosmic-epoch-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_ryanabx-cosmic.repo
-
-type: rpm-ostree
-install:
-  - cosmic-desktop
+  - wget https://copr.fedorainfracloud.org/coprs/ryanabx/cosmic-epoch/repo/fedora-$(rpm -E %fedora)/ryanabx-cosmic-epoch-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_ryanabx-cosmic.repo
diff --git a/recipes/scripts.yml → recipes/custom-scripts.yml b/recipes/scripts.yml → recipes/custom-scripts.yml
diff --git a/recipes/displaylink-packages.yml b/recipes/displaylink-packages.yml
@@ -0,0 +1,3 @@
+type: rpm-ostree
+install:
+  - displaylink
diff --git a/recipes/displaylink.yml → recipes/displaylink-repo.yml b/recipes/displaylink.yml → recipes/displaylink-repo.yml
@@ -1,7 +1,3 @@
 type: script
 snippets:
-  - wget https://copr.fedorainfracloud.org/coprs/crashdummy/Displaylink/repo/fedora-$(rpm -E %fedora)/crashdummy-Displaylink-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_crashdummy-displaylink.repo
-
-type: rpm-ostree
-install:
-  - displaylink
+  - wget https://copr.fedorainfracloud.org/coprs/crashdummy/Displaylink/repo/fedora-$(rpm -E %fedora)/crashdummy-Displaylink-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_crashdummy-displaylink.repo
diff --git a/recipes/extra-repos-rawhide.yml b/recipes/extra-repos-rawhide.yml
diff --git a/recipes/packages-intel.yml → recipes/intel-packages.yml b/recipes/packages-intel.yml → recipes/intel-packages.yml
diff --git a/recipes/recipe-nvidia.yml b/recipes/recipe-nvidia.yml
@@ -15,16 +15,18 @@ modules:
   # - from-file: evdi.yml
   # - from-file: displaylink-evdi.yml
   # - from-file: displaylink.yml
-  - from-file: system76-power.yml
+  - from-file: system76-power-packages.yml
+  - from-file: system76-power-systemd.yml
   - from-file: extra-repos.yml
-  - from-file: cosmic-desktop.yml
+  - from-file: cosmic-desktop-repo.yml
+  - from-file: cosmic-desktop-packages.yml
   - from-file: common-packages.yml
   - from-file: common-flatpaks.yml
-  - from-file: starship.yml
+  - from-file: starship-packages.yml
   - from-file: remove-packages.yml
   - from-file: packages-intel.yml
   - from-file: gnome-extensions.yml
   - from-file: gschema-overrides.yml
-  - from-file: scripts.yml
+  - from-file: custom-scripts.yml
 
   - type: signing # this sets up the proper policy & signing files for signed images to work fully
diff --git a/recipes/recipe-rawhide.yml b/recipes/recipe-rawhide.yml
diff --git a/recipes/recipe.yml b/recipes/recipe.yml
@@ -11,17 +11,20 @@ image-version: latest # latest is also supported if you want new updates ASAP
 # you can include multiple instances of the same module
 modules:
   - from-file: common-files.yml
-  - from-file: system76-power.yml
+  # - from-file: akmods.yml
+  - from-file: system76-power-packages.yml
+  - from-file: system76-power-systemd.yml
   - from-file: extra-repos.yml
-  - from-file: cosmic-desktop.yml
+  - from-file: cosmic-desktop-repo.yml
+  - from-file: cosmic-desktop-packages.yml
   - from-file: common-packages.yml
   - from-file: common-flatpaks.yml
-  - from-file: starship.yml
+  - from-file: starship-packages.yml
   - from-file: remove-packages.yml
-  - from-file: remove-packages-intel.yml
-  - from-file: packages-intel.yml
+  - from-file: remove-nvidia-packages.yml
+  - from-file: intel-packages.yml
   - from-file: intel-specific.yml
   - from-file: gnome-extensions.yml
   - from-file: gschema-overrides.yml
-  - from-file: scripts.yml
+  - from-file: custom-scripts.yml
   - type: signing
diff --git a/recipes/remove-packages-intel.yml → recipes/remove-nvidia-packages.yml b/recipes/remove-packages-intel.yml → recipes/remove-nvidia-packages.yml
diff --git a/recipes/starship.yml → recipes/starship-packages.yml b/recipes/starship.yml → recipes/starship-packages.yml
diff --git a/recipes/starship-rawhide.yml b/recipes/starship-rawhide.yml
diff --git a/recipes/system76-power.yml → recipes/system76-power-packages.yml b/recipes/system76-power.yml → recipes/system76-power-packages.yml
@@ -3,12 +3,4 @@ repos:
   - https://copr.fedorainfracloud.org/coprs/szydell/system76/repo/fedora-%OS_VERSION%/szydell-system76-fedora-%OS_VERSION%.repo
 install:
   - system76-driver
-  - system76-power
-
-type: systemd
-system:
-  enabled:
-    - com.system76.PowerDaemon.service 
-    - system76-power-wake.service
-  masked:
-    - power-profiles-daemon.service
+  - system76-power
diff --git a/recipes/system76-power-rawhide.yml b/recipes/system76-power-rawhide.yml
diff --git a/recipes/system76-power-systemd.yml b/recipes/system76-power-systemd.yml
@@ -0,0 +1,7 @@
+type: systemd
+system:
+  enabled:
+    - com.system76.PowerDaemon.service 
+    - system76-power-wake.service
+  masked:
+    - power-profiles-daemon.service