putting modules files in modules folder in recipes folder

Heus-Sueh · Aug 22, 2024 · 21ae681 · 21ae681
1 parent 9b0ce79
commit 21ae681
Show file tree

Hide file tree

Showing 15 changed files with 89 additions and 33 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,7 +24,9 @@ jobs:
         recipe:
           # !! Add your recipes here
           - recipe.yml
+          - recipe-dx.yml
           - recipe-nvidia.yml
+          - recipe-dx-nvidia.yml
           - recipe-vm.yml
     steps:
       # the build is fully handled by the reusable github action

diff --git a/recipes/gaming.yml b/recipes/gaming.yml
diff --git a/recipes/common-files.yml → recipes/modules/common-files.yml b/recipes/common-files.yml → recipes/modules/common-files.yml
diff --git a/recipes/default-flatpaks.yml → recipes/modules/default-flatpaks.yml b/recipes/default-flatpaks.yml → recipes/modules/default-flatpaks.yml
diff --git a/recipes/developer.yml → recipes/modules/developer.yml b/recipes/developer.yml → recipes/modules/developer.yml
@@ -35,3 +35,23 @@ modules:
       - qemu-system-x86-core
       - qemu-user-binfmt
       - qemu-user-static
+  # SystemD
+  - type: systemd
+    system:
+      enabled:
+        - libvirtd
+        - virtqemud.socket
+        - virtnetworkd.socket
+        - virtstoraged.socket
+        - virtnodedevd.socket
+      disabled:
+        # - flatpak-system-update.timer
+    user:
+      enabled:
+        # - my-custom.service
+      disabled:
+        # - flatpak-user-update.timer
+  # ----------------------------------------------------------------------- #
+  - type: script
+    snippets:
+      # - "curl https://example.com/examplebinary > /usr/bin/examplebinary" # example: download binary
diff --git a/recipes/essential-pkgs.yml → recipes/modules/essential-pkgs.yml b/recipes/essential-pkgs.yml → recipes/modules/essential-pkgs.yml
diff --git a/recipes/fonts.yml → recipes/modules/fonts.yml b/recipes/fonts.yml → recipes/modules/fonts.yml
diff --git a/recipes/modules/gaming.yml b/recipes/modules/gaming.yml
@@ -0,0 +1,43 @@
+modules:
+  # some good packages
+  - type: rpm-ostree
+    repos:
+      - https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/repo/fedora-%OS_VERSION%/kylegospo-bazzite-fedora-%OS_VERSION%.repo
+      - https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite-multilib/repo/fedora-%OS_VERSION%/kylegospo-bazzite-multilib-fedora-%OS_VERSION%.repo
+      - https://copr.fedorainfracloud.org/coprs/kylegospo/LatencyFleX/repo/fedora-%OS_VERSION%/kylegospo-LatencyFleX-fedora-%OS_VERSION%.repo
+      - https://copr.fedorainfracloud.org/coprs/sentry/switcheroo-control_discrete/repo/fedora-%OS_VERSION%/sentry-switcheroo-control_discrete-fedora-%OS_VERSION%.repo
+    install:
+      - gamescope
+      - gamemode
+      - mangohud
+      - lutris
+      - umu-launcher
+      - latencyflex-vulkan-layer
+    replace:
+      - from-repo: https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite-multilib/repo/fedora-%OS_VERSION%/kylegospo-bazzite-multilib-fedora-%OS_VERSION%.repo
+        packages:
+          - mesa-filesystem
+          - mesa-libxatracker
+          - mesa-libglapi
+          - mesa-dri-drivers
+          - mesa-libgbm
+          - mesa-libEGL
+          - mesa-vulkan-drivers
+          - mesa-libGL
+          - pipewire
+          - pipewire-alsa
+          - pipewire-gstreamer
+          - pipewire-jack-audio-connection-kit
+          - pipewire-jack-audio-connection-kit-libs
+          - pipewire-libs
+          - pipewire-pulseaudio
+          - pipewire-utils
+          - pipewire-plugin-libcamera
+          - bluez
+          - bluez-obexd
+          - bluez-cups
+          - bluez-libs
+  # --------------------------------------------------- #
+  - type: script
+    snippets:
+      # - "curl https://example.com/examplebinary > /usr/bin/examplebinary" # example: download binary
diff --git a/recipes/pkgs.yml → recipes/modules/pkgs.yml b/recipes/pkgs.yml → recipes/modules/pkgs.yml
diff --git a/recipes/vm.yml → recipes/modules/vm.yml b/recipes/vm.yml → recipes/modules/vm.yml
diff --git a/recipes/recipe-nvidia-dx.yml → recipes/recipe-dx-nvidia.yml b/recipes/recipe-nvidia-dx.yml → recipes/recipe-dx-nvidia.yml
@@ -1,5 +1,5 @@
 # image will be published to ghcr.io/<user>/<name>
-name: hyprland-nvidia-dx
+name: hyprland-dx-nvidia
 # description will be included in the image's metadata
 description: This is my personal OS image.
 
@@ -11,11 +11,11 @@ image-version: 40 # latest is also supported if you want new updates ASAP
 # you can include multiple instances of the same module
 modules:
   # ----------------------------------------------------------------------------------------------------------------------------
-  - from-file: pkgs.yml
-  - from-file: common-files.yml
-  - from-file: fonts.yml
-  - from-file: default-flatpaks.yml
-  - from-file: developer.yml
+  - from-file: modules/pkgs.yml
+  - from-file: modules/common-files.yml
+  - from-file: modules/fonts.yml
+  - from-file: modules/default-flatpaks.yml
+  - from-file: modules/developer.yml
   # ----------------------------------------------------------------------------------------------------------------------------
   # SystemD
   - type: systemd

diff --git a/recipes/recipe-dx.yml b/recipes/recipe-dx.yml
@@ -9,11 +9,11 @@ image-version: 40 # latest is also supported if you want new updates ASAP
 # you can include multiple instances of the same module
 modules:
   # ---------------------------------------------------------------------------------------------------------------------------
-  - from-file: pkgs.yml
-  - from-file: common-files.yml
-  - from-file: fonts.yml
-  - from-file: default-flatpaks.yml
-  - from-file: developer.yml
+  - from-file: modules/pkgs.yml
+  - from-file: modules/common-files.yml
+  - from-file: modules/fonts.yml
+  - from-file: modules/default-flatpaks.yml
+  - from-file: modules/developer.yml
   # ---------------------------------------------------------------------------------------------------------------------------
   # SystemD
   - type: systemd

diff --git a/recipes/recipe-nvidia.yml b/recipes/recipe-nvidia.yml
@@ -9,10 +9,10 @@ image-version: 40 # latest is also supported if you want new updates ASAP
 # you can include multiple instances of the same module
 modules:
   # ----------------------------------------------------------------------------------------------------------------------------
-  - from-file: pkgs.yml
-  - from-file: common-files.yml
-  - from-file: fonts.yml
-  - from-file: default-flatpaks.yml
+  - from-file: modules/pkgs.yml
+  - from-file: modules/common-files.yml
+  - from-file: modules/fonts.yml
+  - from-file: modules/default-flatpaks.yml
   # ----------------------------------------------------------------------------------------------------------------------------
   # SystemD
   - type: systemd

diff --git a/recipes/recipe-vm.yml b/recipes/recipe-vm.yml
@@ -9,11 +9,11 @@ image-version: 40 # latest is also supported if you want new updates ASAP
 # you can include multiple instances of the same module
 modules:
   # ---------------------------------------------------------------------------------------------------------------------------
-  - from-file: pkgs.yml
-  - from-file: common-files.yml
-  - from-file: fonts.yml
-  - from-file: default-flatpaks.yml
-  - from-file: vm.yml
+  - from-file: modules/pkgs.yml
+  - from-file: modules/common-files.yml
+  - from-file: modules/fonts.yml
+  - from-file: modules/default-flatpaks.yml
+  - from-file: modules/vm.yml
   # ---------------------------------------------------------------------------------------------------------------------------
   # SystemD
   - type: systemd

diff --git a/recipes/recipe.yml b/recipes/recipe.yml
@@ -9,10 +9,10 @@ image-version: 40 # latest is also supported if you want new updates ASAP
 # you can include multiple instances of the same module
 modules:
   # ---------------------------------------------------------------------------------------------------------------------------
-  - from-file: pkgs.yml
-  - from-file: common-files.yml
-  - from-file: fonts.yml
-  - from-file: default-flatpaks.yml
+  - from-file: modules/pkgs.yml
+  - from-file: modules/common-files.yml
+  - from-file: modules/fonts.yml
+  - from-file: modules/default-flatpaks.yml
   # ---------------------------------------------------------------------------------------------------------------------------
   # SystemD
   - type: systemd