From 505bd27538aa84ab76afce774b03a039f59e7479 Mon Sep 17 00:00:00 2001
From: Cappy Ishihara <cappy@cappuchino.xyz>
Date: Sun, 22 Oct 2023 07:21:42 +0700
Subject: [PATCH] funnies

---
 katsu/modules/flagship/budgie.yaml      | 24 ++++++++----------------
 katsu/modules/flagship/flagship-live.sh |  2 +-
 katsu/modules/liveimage/live.sh         |  4 ++--
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/katsu/modules/flagship/budgie.yaml b/katsu/modules/flagship/budgie.yaml
index 721a78af..35c4fb63 100644
--- a/katsu/modules/flagship/budgie.yaml
+++ b/katsu/modules/flagship/budgie.yaml
@@ -9,27 +9,24 @@ dnf:
     - gdm
     - budgie-desktop-defaults
     - nautilus
+    - papirus-icon-theme
     - gnome-shell
+    - materia-gtk-theme
   packages:
-    - manrope-fonts
+    - "@ultramarine-flagship-product-environment"
+    - "@libreoffice"
+    - "@input-methods"
+    - "@core"
+    - "@multimedia"
+    - "@fonts"
     - nemo
     - nemo-fileroller
     - nemo-extensions
     - nemo-preview
     - nemo-emblems
-    - "@ultramarine-flagship-product"
-    - "@base-x"
-    - "@core"
-    - "@libreoffice"
     - bind-utils
     - psmisc
     - fuse
-    - "@input-methods"
-    - "@multimedia"
-    - "@fonts"
-    - "@budgie-desktop"
-    # - "@flagship-product-environment"
-    - "@budgie-desktop-apps"
     - policycoreutils
     - coreutils
     - gnome-software
@@ -51,12 +48,7 @@ dnf:
     - xdg-user-dirs-gtk
     - python3-psutil
     - fluent-theme
-    - fluent-icon-theme
     - ultramarine-release-identity-flagship
     - ultramarine-backgrounds-gnome
     - ultramarine-backgrounds-basic
-    - budgie-desktop
-    - budgie-extras
-    - budgie-extras-daemon
-    - budgie-desktop-view
     - ultramarine-flagship-filesystem
diff --git a/katsu/modules/flagship/flagship-live.sh b/katsu/modules/flagship/flagship-live.sh
index d0ae0cdf..e1503eba 100644
--- a/katsu/modules/flagship/flagship-live.sh
+++ b/katsu/modules/flagship/flagship-live.sh
@@ -58,6 +58,6 @@ cp /etc/lightdm/lightdm.conf.d/50-ultramarine-lightdm-gtk-greeter.conf /etc/ligh
 
 # Reinstall anaconda-core and anaconda-live to make sure we fix any localization issues
 
-dnf reinstall -y anaconda-core
+# dnf reinstall -y anaconda-core
 
 dnf clean all
diff --git a/katsu/modules/liveimage/live.sh b/katsu/modules/liveimage/live.sh
index fc82c0b6..b499f12e 100644
--- a/katsu/modules/liveimage/live.sh
+++ b/katsu/modules/liveimage/live.sh
@@ -14,11 +14,11 @@ vartmp   /var/tmp    tmpfs   defaults   0  0
 EOF
 
 # work around for poor key import UI in PackageKit
-rm -f /var/lib/rpm/__db*
+# rm -f /var/lib/rpm/__db*
 echo "Packages within this LiveCD"
 rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn
 # Note that running rpm recreates the rpm db files which aren't needed or wanted
-rm -f /var/lib/rpm/__db*
+# rm -f /var/lib/rpm/__db*
 
 
 # go ahead and pre-make the man -k cache (#455968)