From 4287d7b41c051b751d0c95a2220257f7afd8b3a7 Mon Sep 17 00:00:00 2001
From: Gerald Pinder <gmpinder@gmail.com>
Date: Thu, 11 Apr 2024 21:46:00 -0400
Subject: [PATCH] Rearrange modules

---
 config/scripts/setup-kubectl.sh      | 2 +-
 recipes/dev-packages.yml             | 4 ++--
 recipes/gaming.yml                   | 3 +++
 recipes/recipe-jp-desktop-gaming.yml | 5 ++---
 recipes/recipe-jp-laptop.yml         | 7 +++----
 5 files changed, 11 insertions(+), 10 deletions(-)
 create mode 100644 recipes/gaming.yml

diff --git a/config/scripts/setup-kubectl.sh b/config/scripts/setup-kubectl.sh
index 6bf9208..f8b4109 100644
--- a/config/scripts/setup-kubectl.sh
+++ b/config/scripts/setup-kubectl.sh
@@ -2,7 +2,7 @@
 
 set -oue pipefail
 
-cat <<EOF | tee /etc/yum.repos.d/kubernetes.repo
+cat <<EOF | tee /usr/etc/yum.repos.d/kubernetes.repo
 [kubernetes]
 name=Kubernetes
 baseurl=https://pkgs.k8s.io/core:/stable:/v1.29/rpm/
diff --git a/recipes/dev-packages.yml b/recipes/dev-packages.yml
index afaad9f..e40e7ce 100644
--- a/recipes/dev-packages.yml
+++ b/recipes/dev-packages.yml
@@ -1,8 +1,6 @@
 modules:
-  - from-file: docker-engine.yml
   - type: script
     scripts:
-      - install-mkcert.sh
       - setup-kubectl.sh
   - type: rpm-ostree
     repos:
@@ -28,4 +26,6 @@ modules:
       - gh
   - type: script
     scripts:
+      - install-mkcert.sh
       - install-codelldb.sh
+  - from-file: docker-engine.yml
diff --git a/recipes/gaming.yml b/recipes/gaming.yml
new file mode 100644
index 0000000..f1d05bc
--- /dev/null
+++ b/recipes/gaming.yml
@@ -0,0 +1,3 @@
+modules:
+  - type: r2modman
+    version: 3.1.48
diff --git a/recipes/recipe-jp-desktop-gaming.yml b/recipes/recipe-jp-desktop-gaming.yml
index eb04570..65de493 100644
--- a/recipes/recipe-jp-desktop-gaming.yml
+++ b/recipes/recipe-jp-desktop-gaming.yml
@@ -4,12 +4,11 @@ image-version: stable
 description: The image of Wunker OS for JP's desktop gaming.
 blue-build-tag: main-installer
 modules:
+  - type: signing
   - type: files
     files:
       - steam-firewall: /usr
       - desktop-audio: /usr
   - from-file: jp-apps.yml
+  - from-file: gaming.yml
   - from-file: dev-packages.yml
-  - type: r2modman
-    version: 3.1.48
-  - type: signing
diff --git a/recipes/recipe-jp-laptop.yml b/recipes/recipe-jp-laptop.yml
index 5d08e85..734799b 100644
--- a/recipes/recipe-jp-laptop.yml
+++ b/recipes/recipe-jp-laptop.yml
@@ -3,12 +3,11 @@ base-image: ghcr.io/ublue-os/bazzite
 image-version: latest
 description: The image of Wunker OS for JP's Laptop.
 modules:
+  - type: signing
   - from-file: jp-apps.yml
-  - from-file: dev-packages.yml
   - type: rpm-ostree
     install:
       - fprintd
       - fprintd-pam
-  - type: r2modman
-    version: 3.1.47
-  - type: signing
+  - from-file: gaming.yml
+  - from-file: dev-packages.yml