From 9457d4ea532c8e5b0a437047dbcde07951a37be5 Mon Sep 17 00:00:00 2001
From: Gerald Pinder <4626052+gmpinder@users.noreply.github.com>
Date: Mon, 10 Feb 2025 23:26:26 -0500
Subject: [PATCH] Update repos for dnf module

---
 recipes/common/bootc-setup.yml        |  9 ++++---
 recipes/common/dev-packages-bootc.yml | 17 ++++++++----
 recipes/common/dev-packages.yml       |  6 +++++
 recipes/common/jp-desktop-bootc.yml   |  5 ++--
 recipes/common/jp-laptop-bootc.yml    |  5 ++--
 recipes/common/jp-packages-bootc.yml  | 11 ++++----
 recipes/jp-laptop-bootc.yml           | 37 +++++++++++++++++++--------
 7 files changed, 61 insertions(+), 29 deletions(-)

diff --git a/recipes/common/bootc-setup.yml b/recipes/common/bootc-setup.yml
index e2ee73c..9420d86 100644
--- a/recipes/common/bootc-setup.yml
+++ b/recipes/common/bootc-setup.yml
@@ -9,10 +9,11 @@ modules:
   - type: dnf
     source: ghcr.io/blue-build/modules/dnf:dnf-module 
     repos:
-      - https://negativo17.org/repos/fedora-multimedia.repo
-    copr:
-      - ublue-os/staging
-      - kylegospo/oversteer
+      files:
+        - https://negativo17.org/repos/fedora-multimedia.repo
+      copr:
+        - ublue-os/staging
+        - kylegospo/oversteer
     install:
       packages:
         - https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-%OS_VERSION%.noarch.rpm
diff --git a/recipes/common/dev-packages-bootc.yml b/recipes/common/dev-packages-bootc.yml
index 7499735..5aadd5c 100644
--- a/recipes/common/dev-packages-bootc.yml
+++ b/recipes/common/dev-packages-bootc.yml
@@ -5,11 +5,12 @@ modules:
     # source: local
     source: ghcr.io/blue-build/modules/dnf:dnf-module 
     repos:
-      - kubectl.repo
-      - google-cloud-sdk.repo
-      - https://pkg.earthly.dev/earthly.repo
-      - https://cli.github.com/packages/rpm/gh-cli.repo
-      - https://download.docker.com/linux/fedora/docker-ce.repo
+      files:
+        - kubectl.repo
+        - google-cloud-sdk.repo
+        - https://pkg.earthly.dev/earthly.repo
+        - https://cli.github.com/packages/rpm/gh-cli.repo
+        - https://download.docker.com/linux/fedora/docker-ce.repo
     group-install:
       packages:
         - development-tools
@@ -44,6 +45,12 @@ modules:
         - glab
         - hugo
         - copr-cli
+        - rpm-build
+        - rpm-devel
+        - rpmlint
+        - diffutils
+        - patch
+        - rpmdevtools
   - type: systemd
     system:
       enabled:
diff --git a/recipes/common/dev-packages.yml b/recipes/common/dev-packages.yml
index bef5f2d..288ec9d 100644
--- a/recipes/common/dev-packages.yml
+++ b/recipes/common/dev-packages.yml
@@ -33,6 +33,12 @@ modules:
       - glab
       - hugo
       - copr-cli
+      - rpm-build
+      - rpm-devel
+      - rpmlint
+      - diffutils
+      - patch
+      - rpmdevtools
   - type: script
     scripts:
       - install-mkcert.sh
diff --git a/recipes/common/jp-desktop-bootc.yml b/recipes/common/jp-desktop-bootc.yml
index 65fb866..f2c2ec1 100644
--- a/recipes/common/jp-desktop-bootc.yml
+++ b/recipes/common/jp-desktop-bootc.yml
@@ -4,8 +4,9 @@ modules:
   - from-file: common/bootc-setup.yml
   - type: dnf
     source: ghcr.io/blue-build/modules/dnf:dnf-module 
-    copr:
-      - ryanabx/cosmic-epoch
+    repos:
+      copr:
+        - ryanabx/cosmic-epoch
     install:
       packages:
         - cosmic-desktop
diff --git a/recipes/common/jp-laptop-bootc.yml b/recipes/common/jp-laptop-bootc.yml
index a9d49d1..5480059 100644
--- a/recipes/common/jp-laptop-bootc.yml
+++ b/recipes/common/jp-laptop-bootc.yml
@@ -4,8 +4,9 @@ modules:
   - from-file: common/bootc-setup.yml
   - type: dnf
     source: ghcr.io/blue-build/modules/dnf:dnf-module 
-    copr:
-      - ryanabx/cosmic-epoch
+    repos:
+      copr:
+        - ryanabx/cosmic-epoch
     install:
       packages:
         - cosmic-desktop
diff --git a/recipes/common/jp-packages-bootc.yml b/recipes/common/jp-packages-bootc.yml
index bb11ec4..823f3bb 100644
--- a/recipes/common/jp-packages-bootc.yml
+++ b/recipes/common/jp-packages-bootc.yml
@@ -6,11 +6,12 @@ modules:
     optfix:
       - brave.com
     repos:
-      - https://pkgs.tailscale.com/stable/fedora/tailscale.repo
-      - https://brave-browser-rpm-release.s3.brave.com/brave-browser.repo
-      - fury.repo
-    keys:
-      - https://brave-browser-rpm-release.s3.brave.com/brave-core.asc
+      files:
+        - https://pkgs.tailscale.com/stable/fedora/tailscale.repo
+        - https://brave-browser-rpm-release.s3.brave.com/brave-browser.repo
+        - fury.repo
+      keys:
+        - https://brave-browser-rpm-release.s3.brave.com/brave-core.asc
     install:
       packages:
         - libadwaita
diff --git a/recipes/jp-laptop-bootc.yml b/recipes/jp-laptop-bootc.yml
index e653454..7b733e4 100644
--- a/recipes/jp-laptop-bootc.yml
+++ b/recipes/jp-laptop-bootc.yml
@@ -8,18 +8,33 @@ alt-tags:
 description: The image of Wunker OS for JP's Laptop.
 stages:
   - from-file: common/helix.yml
-  - name: cosmic-comp
-    from: rust
-    modules:
-      - type: cosmic
-        source: local
-        component: cosmic-comp
-        debug: true
+  # - name: cosmic-comp
+  #   from: rust
+  #   modules:
+  #     - type: cosmic
+  #       source: local
+  #       component: cosmic-comp
+  #       debug: true
 modules:
   - from-file: common/jp-laptop-bootc.yml
   - from-file: common/helix.yml
-  - type: copy
-    from: cosmic-comp
-    src: /out/cosmic-comp
-    dest: /usr/bin/cosmic-comp
+  # - type: copy
+  #   from: cosmic-comp
+  #   src: /out/cosmic-comp
+  #   dest: /usr/bin/cosmic-comp
+  - type: dnf
+    source: ghcr.io/blue-build/modules/dnf:dnf-module 
+    repos:
+      files:
+        remove:
+          - brave-browser
+          - tailscale-stable
+          - fedora-multimedia
+          - earthly-stable
+          - docker-ce-stable
+          - gh-cli
+          - google-cloud-cli
+      copr:
+        disable:
+          - ryanabx/cosmic-epoch
   - from-file: common/post-build.yml