From 7800b50070c6ba00cde6ec9b6bb60a61118fc52c Mon Sep 17 00:00:00 2001
From: Gerald Pinder <4626052+gmpinder@users.noreply.github.com>
Date: Sun, 11 Aug 2024 15:48:12 -0400
Subject: [PATCH] Move files from /usr/etc to /etc

---
 .../share/plymouth/themes/spinner}/watermark.png    | Bin
 .../{ => usr}/lib/firmware/hda-jack-retask.fw       |   0
 .../system/rtkit-daemon.service.d/limits.conf       |   0
 recipes/common/bluebuild-logo.yml                   |   2 +-
 recipes/common/gaming.yml                           |   2 +-
 recipes/common/jp-common.yml                        |   2 +-
 recipes/common/jp-desktop.yml                       |   2 +-
 recipes/common/pipewire-tweaks.yml                  |   2 +-
 recipes/common/updates.yml                          |   2 +-
 recipes/cp-laptop.yml                               |   2 +-
 10 files changed, 7 insertions(+), 7 deletions(-)
 rename files/bluebuild-logo/{ => usr/share/plymouth/themes/spinner}/watermark.png (100%)
 rename files/desktop-audio/{ => usr}/lib/firmware/hda-jack-retask.fw (100%)
 rename files/pipewire-tweaks/{ => usr}/lib/systemd/system/rtkit-daemon.service.d/limits.conf (100%)

diff --git a/files/bluebuild-logo/watermark.png b/files/bluebuild-logo/usr/share/plymouth/themes/spinner/watermark.png
similarity index 100%
rename from files/bluebuild-logo/watermark.png
rename to files/bluebuild-logo/usr/share/plymouth/themes/spinner/watermark.png
diff --git a/files/desktop-audio/lib/firmware/hda-jack-retask.fw b/files/desktop-audio/usr/lib/firmware/hda-jack-retask.fw
similarity index 100%
rename from files/desktop-audio/lib/firmware/hda-jack-retask.fw
rename to files/desktop-audio/usr/lib/firmware/hda-jack-retask.fw
diff --git a/files/pipewire-tweaks/lib/systemd/system/rtkit-daemon.service.d/limits.conf b/files/pipewire-tweaks/usr/lib/systemd/system/rtkit-daemon.service.d/limits.conf
similarity index 100%
rename from files/pipewire-tweaks/lib/systemd/system/rtkit-daemon.service.d/limits.conf
rename to files/pipewire-tweaks/usr/lib/systemd/system/rtkit-daemon.service.d/limits.conf
diff --git a/recipes/common/bluebuild-logo.yml b/recipes/common/bluebuild-logo.yml
index a56c55f..2917e31 100644
--- a/recipes/common/bluebuild-logo.yml
+++ b/recipes/common/bluebuild-logo.yml
@@ -2,7 +2,7 @@ modules:
   - type: files
     files:
       - source: bluebuild-logo 
-        destination: /usr/share/plymouth/themes/spinner/
+        destination: /
   - type: script
     scripts:
       - initramfs.sh
diff --git a/recipes/common/gaming.yml b/recipes/common/gaming.yml
index e0f35b8..f143eca 100644
--- a/recipes/common/gaming.yml
+++ b/recipes/common/gaming.yml
@@ -2,7 +2,7 @@ modules:
   - type: files
     files:
       - source: steam-firewall
-        destination: /usr
+        destination: /
   - type: r2modman
     version: 3.1.49
   # - type: script
diff --git a/recipes/common/jp-common.yml b/recipes/common/jp-common.yml
index 8ee44cc..ca1ca1e 100644
--- a/recipes/common/jp-common.yml
+++ b/recipes/common/jp-common.yml
@@ -8,7 +8,7 @@ modules:
   - type: files
     files:
       - source: distrobox
-        destination: /usr
+        destination: /
   - type: fonts
     nerd-fonts:
       - JetBrainsMono
diff --git a/recipes/common/jp-desktop.yml b/recipes/common/jp-desktop.yml
index 3fd5454..1d713f4 100644
--- a/recipes/common/jp-desktop.yml
+++ b/recipes/common/jp-desktop.yml
@@ -2,5 +2,5 @@ modules:
   - type: files
     files:
       - source: desktop-audio
-        destination: /usr
+        destination: /
   - from-file: common/jp-common.yml
diff --git a/recipes/common/pipewire-tweaks.yml b/recipes/common/pipewire-tweaks.yml
index 718802b..e2a286f 100644
--- a/recipes/common/pipewire-tweaks.yml
+++ b/recipes/common/pipewire-tweaks.yml
@@ -2,4 +2,4 @@ modules:
 - type: files
   files:
   - source: pipewire-tweaks
-    destination: /usr
+    destination: /
diff --git a/recipes/common/updates.yml b/recipes/common/updates.yml
index e8b2f57..f91bd76 100644
--- a/recipes/common/updates.yml
+++ b/recipes/common/updates.yml
@@ -2,7 +2,7 @@ modules:
   - type: files
     files:
       - source: rpm-ostreed-conf
-        destination: /usr/etc
+        destination: /etc
   - type: systemd
     system:
       masked:
diff --git a/recipes/cp-laptop.yml b/recipes/cp-laptop.yml
index e59e5a5..8cbdefd 100644
--- a/recipes/cp-laptop.yml
+++ b/recipes/cp-laptop.yml
@@ -1,6 +1,6 @@
 name: cp-laptop
 base-image: ghcr.io/ublue-os/kinoite-main
-image-version: 40-20240616
+image-version: 40
 description: The image of Wunker OS for CP's laptop.
 modules:
   - type: rpm-ostree