chore: general cleanup of what this entire project is - a wrapper ont…

…op of bazzite
tulilirockz · Aug 22, 2023 · 0e9f2af · 0e9f2af
1 parent c19c143
commit 0e9f2af
Show file tree

Hide file tree

Showing 27 changed files with 8 additions and 143 deletions.
diff --git a/recipe-main.yml b/recipe-main.yml
@@ -1,5 +1,5 @@
 name: malachite
-base-image: ghcr.io/ublue-os/kinoite-main
+base-image: ghcr.io/ublue-os/bazzite
 fedora-version: 38
 description: Opinionated Fedora Silverblue-based operating system image
 
@@ -10,29 +10,18 @@ scripts:
     - autorun.sh
 rpm:
   repos:
-    - https://copr.fedorainfracloud.org/coprs/kylegospo/hl2linux-selinux/repo/fedora-%FEDORA_VERSION%/kylegospo-hl2linux-selinux-fedora-%FEDORA_VERSION%.repo
-    - https://copr.fedorainfracloud.org/coprs/kylegospo/wallpaper-engine-kde-plugin/repo/fedora-%FEDORA_VERSION%/kylegospo-wallpaper-engine-kde-plugin-fedora-%FEDORA_VERSION%.repo
   install:
     - python3-pip
     - libadwaita
     - iwd
-    - python3-pip
-    - libadwaita
     - tmux
     - podman-docker
     - cockpit
     - cockpit-podman
     - cockpit-navigator
     - cockpit-file-sharing
     - tailscale
-    - wallpaper-engine-kde-plugin
-    - hl2linux-selinux
-    - qt5-qtwebsockets
   remove:
-    - firefox
-    - firefox-langpacks
     - wpa_supplicant
-    - htop
-    - nvtop
 firstboot:
   yafti: true
diff --git a/recipe-nvidia.yml b/recipe-nvidia.yml
@@ -1,5 +1,5 @@
 name: malachite-nvidia
-base-image: ghcr.io/ublue-os/kinoite-nvidia
+base-image: ghcr.io/ublue-os/bazzite-nvidia
 fedora-version: 38
 description: Opinionated Fedora Silverblue-based operating system image
 
@@ -10,8 +10,6 @@ scripts:
     - autorun.sh
 rpm:
   repos:
-    - https://copr.fedorainfracloud.org/coprs/kylegospo/hl2linux-selinux/repo/fedora-%FEDORA_VERSION%/kylegospo-hl2linux-selinux-fedora-%FEDORA_VERSION%.repo
-    - https://copr.fedorainfracloud.org/coprs/kylegospo/wallpaper-engine-kde-plugin/repo/fedora-%FEDORA_VERSION%/kylegospo-wallpaper-engine-kde-plugin-fedora-%FEDORA_VERSION%.repo
   install:
     - python3-pip
     - libadwaita
@@ -25,14 +23,7 @@ rpm:
     - cockpit-navigator
     - cockpit-file-sharing
     - tailscale
-    - wallpaper-engine-kde-plugin
-    - hl2linux-selinux
-    - qt5-qtwebsockets
   remove:
-    - firefox
-    - firefox-langpacks
     - wpa_supplicant
-    - htop
-    - nvtop
 firstboot:
   yafti: true
diff --git a/usr/bin/refresh-yafti b/usr/bin/refresh-yafti
diff --git a/usr/bin/steam b/usr/bin/steam
diff --git a/usr/bin/steam-session b/usr/bin/steam-session
diff --git a/usr/bin/yafti-malachite b/usr/bin/yafti-malachite
@@ -0,0 +1,3 @@
+#!/bin/sh
+rm -r "$HOME/.config/yafti"
+yafti /usr/share/ublue-os/malachite/yafti-malachite.yml
diff --git a/usr/etc/dconf/db/gdm.d/01-turquoise b/usr/etc/dconf/db/gdm.d/01-turquoise
diff --git a/usr/etc/dconf/profile/gdm b/usr/etc/dconf/profile/gdm
diff --git a/usr/etc/dconf/profile/user b/usr/etc/dconf/profile/user
diff --git a/usr/etc/ssh/ssh_config.d/60-harden.conf b/usr/etc/ssh/ssh_config.d/60-harden.conf
diff --git a/usr/etc/sysctl.d/10-memory.conf b/usr/etc/sysctl.d/10-memory.conf
diff --git a/usr/etc/sysctl.d/20-gaming.conf b/usr/etc/sysctl.d/20-gaming.conf
diff --git a/usr/etc/sysctl.d/30-networking.conf b/usr/etc/sysctl.d/30-networking.conf
diff --git a/usr/etc/update.d/99-boxes.sh → usr/etc/update.d/99-nimbus.sh b/usr/etc/update.d/99-boxes.sh → usr/etc/update.d/99-nimbus.sh
@@ -4,10 +4,4 @@ if [[ $(distrobox list | grep nimbus) ]]; then
 	/usr/bin/distrobox-enter -n nimbus -- 'paru -Sua --noconfirm'
 else
 	echo "Update skipped: nimbus not installed"
-fi
-
-if [[ $(distrobox list | grep gamebox) ]]; then
-	/usr/bin/distrobox-enter -n gamebox -- 'paru -Sua --noconfirm'
-else
-	echo "Update skipped: gamebox not installed"
 fi
diff --git a/usr/lib/systemd/user-preset/10-rdp.preset b/usr/lib/systemd/user-preset/10-rdp.preset
diff --git a/usr/share/applications/Yafti.desktop → ...share/applications/Malachite Apps.desktop b/usr/share/applications/Yafti.desktop → ...share/applications/Malachite Apps.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
 Name=Yafti
-Exec=sh /usr/bin/refresh-yafti
+Exec=sh /usr/bin/yafti-malachite
 Icon=fish
 Categories=System
diff --git a/usr/share/ublue-os/firstboot/launcher/autostart.desktop b/usr/share/ublue-os/firstboot/launcher/autostart.desktop
diff --git a/usr/share/ublue-os/firstboot/launcher/autostart.sh b/usr/share/ublue-os/firstboot/launcher/autostart.sh
diff --git a/usr/share/ublue-os/firstboot/launcher/launcher-flowchart.png b/usr/share/ublue-os/firstboot/launcher/launcher-flowchart.png
diff --git a/usr/share/ublue-os/firstboot/launcher/login-profile.sh b/usr/share/ublue-os/firstboot/launcher/login-profile.sh
diff --git a/usr/share/ublue-os/just/custom.just → ...share/ublue-os/just/custom-malachite.just b/usr/share/ublue-os/just/custom.just → ...share/ublue-os/just/custom-malachite.just
diff --git a/usr/share/ublue-os/malachite/applications/ForceWaydroid.desktop b/usr/share/ublue-os/malachite/applications/ForceWaydroid.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Name=WaydroidForce
+Name=Waydroid Force Start
 Exec=/usr/bin/waydroid-forcestart
 Icon=waydroid
 Categories=X-WayDroid-App;

diff --git a/usr/share/ublue-os/malachite/applications/KillWaydroid.desktop b/usr/share/ublue-os/malachite/applications/KillWaydroid.desktop
@@ -4,5 +4,4 @@ Name=Waydroid Kill Server
 Exec=/usr/bin/pkexec waydroid container stop
 Icon=waydroid
 Categories=X-WayDroid-App;
-X-Purism-FormFactor=Workstation;Mobile;
-
+X-Purism-FormFactor=Workstation;Mobile;
diff --git a/usr/etc/dconf/db/local.d/01-turquoise → ...blue-os/malachite/dconf/raw_malachite.ini b/usr/etc/dconf/db/local.d/01-turquoise → ...blue-os/malachite/dconf/raw_malachite.ini
diff --git a/usr/share/ublue-os/malachite/sessions/steam-session.desktop b/usr/share/ublue-os/malachite/sessions/steam-session.desktop
diff --git a/usr/share/ublue-os/malachite/sessions/waydroid-session.desktop b/usr/share/ublue-os/malachite/sessions/waydroid-session.desktop
diff --git a/usr/share/ublue-os/firstboot/yafti.yml → ...re/ublue-os/malachite/yafti-malachite.yml b/usr/share/ublue-os/firstboot/yafti.yml → ...re/ublue-os/malachite/yafti-malachite.yml
@@ -16,12 +16,6 @@ screens:
       show_terminal: true
       package_manager: yafti.plugin.run
       groups:
-        Gaming:
-          description: A container for gaming! - Sets up Steam, Lutris and more!
-          default: false
-          packages:
-            - Setup Gamebox Container: just --unstable setup gamebox
-            - Setup Steam-only session: just --unstable setup steam-session
         Nimbus:
           description: Development toolbox meant for coding!
           default: false