From da1b3f9ca2cf276f277b9357a4ceaadfa7c3937e Mon Sep 17 00:00:00 2001
From: Tulili <tulilirockz.pub+git@gmail.com>
Date: Fri, 30 Jun 2023 06:02:23 -0300
Subject: [PATCH] feat: integrate bling repo (#105)

includes everything from the bling repository to this repository (COPY)
and removes features now ingested from bling

---------

Co-authored-by: ER
---
 Containerfile                       |  12 ++-
 usr/bin/.gitkeep                    |   0
 usr/bin/ublue-nix-install           | 130 ----------------------------
 usr/bin/ublue-nix-uninstall         |  86 ------------------
 usr/share/ublue-os/just/custom.just |  27 +-----
 5 files changed, 15 insertions(+), 240 deletions(-)
 create mode 100644 usr/bin/.gitkeep
 delete mode 100644 usr/bin/ublue-nix-install
 delete mode 100755 usr/bin/ublue-nix-uninstall

diff --git a/Containerfile b/Containerfile
index 152a4eef66..2789d151ea 100644
--- a/Containerfile
+++ b/Containerfile
@@ -27,6 +27,15 @@ COPY usr /usr
 # Copy the recipe that we're building.
 COPY ${RECIPE} /usr/share/ublue-os/recipe.yml
 
+# Copy nix install script and Universal Blue wallpapers RPM from Bling image
+COPY --from=ghcr.io/ublue-os/bling:latest /rpms/ublue-os-wallpapers-0.1-1.fc38.noarch.rpm /tmp/ublue-os-wallpapers-0.1-1.fc38.noarch.rpm
+
+# Integrate bling justfiles onto image
+COPY --from=ghcr.io/ublue-os/bling:latest /files/usr/share/ublue-os/just /usr/share/ublue-os/just
+
+# Add nix installer if you want to use it
+COPY --from=ghcr.io/ublue-os/bling:latest /files/usr/bin/ublue-nix* /usr/bin
+
 # "yq" used in build.sh and the "setup-flatpaks" just-action to read recipe.yml.
 # Copied from the official container image since it's not available as an RPM.
 COPY --from=docker.io/mikefarah/yq /usr/bin/yq /usr/bin/yq
@@ -35,7 +44,8 @@ COPY --from=docker.io/mikefarah/yq /usr/bin/yq /usr/bin/yq
 COPY scripts /tmp/scripts
 
 # Run the build script, then clean up temp files and finalize container build.
-RUN chmod +x /tmp/scripts/build.sh && \
+RUN rpm-ostree install /tmp/ublue-os-wallpapers-0.1-1.fc38.noarch.rpm && \
+        chmod +x /tmp/scripts/build.sh && \
         /tmp/scripts/build.sh && \
         rm -rf /tmp/* /var/* && \
         ostree container commit
diff --git a/usr/bin/.gitkeep b/usr/bin/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/usr/bin/ublue-nix-install b/usr/bin/ublue-nix-install
deleted file mode 100644
index 28c79fa257..0000000000
--- a/usr/bin/ublue-nix-install
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/bin/bash
-# original script here: https://github.com/dnkmmr69420/nix-with-selinux/blob/main/silverblue-installer.sh
-# thanks dnkmmr!
-
-sudo sleep 2
-echo "Adding SELinux content to /nix"
-sudo semanage fcontext -a -t etc_t '/nix/store/[^/]+/etc(/.*)?' ; sudo semanage fcontext -a -t lib_t '/nix/store/[^/]+/lib(/.*)?' ; sudo semanage fcontext -a -t systemd_unit_file_t '/nix/store/[^/]+/lib/systemd/system(/.*)?' ; sudo semanage fcontext -a -t man_t '/nix/store/[^/]+/man(/.*)?' ; sudo semanage fcontext -a -t bin_t '/nix/store/[^/]+/s?bin(/.*)?' ; sudo semanage fcontext -a -t usr_t '/nix/store/[^/]+/share(/.*)?' ; sudo semanage fcontext -a -t var_run_t '/nix/var/nix/daemon-socket(/.*)?' ; sudo semanage fcontext -a -t usr_t '/nix/var/nix/profiles(/per-user/[^/]+)?/[^/]+'
-sleep 1
-sudo mkdir /var/lib/nix
-sleep 1
-echo "Adding SELinux content to /var/lib/nix"
-sudo semanage fcontext -a -t etc_t '/var/lib/nix/store/[^/]+/etc(/.*)?' ; sudo semanage fcontext -a -t lib_t '/var/lib/nix/store/[^/]+/lib(/.*)?' ; sudo semanage fcontext -a -t systemd_unit_file_t '/var/lib/nix/store/[^/]+/lib/systemd/system(/.*)?' ; sudo semanage fcontext -a -t man_t '/var/lib/nix/store/[^/]+/man(/.*)?' ; sudo semanage fcontext -a -t bin_t '/var/lib/nix/store/[^/]+/s?bin(/.*)?' ; sudo semanage fcontext -a -t usr_t '/var/lib/nix/store/[^/]+/share(/.*)?' ; sudo semanage fcontext -a -t var_run_t '/var/lib/nix/var/nix/daemon-socket(/.*)?' ; sudo semanage fcontext -a -t usr_t '/var/lib/nix/var/nix/profiles(/per-user/[^/]+)?/[^/]+'
-echo "Creating service files"
-sleep 1
-sleep 1
-echo "Creating rootfs mkdir service"
-
-sudo tee /etc/systemd/system/mkdir-rootfs@.service <<EOF
-[Unit]
-Description=Enable mount points in / for ostree
-ConditionPathExists=!%f
-DefaultDependencies=no
-Requires=local-fs-pre.target
-After=local-fs-pre.target
-
-[Service]
-Type=oneshot
-ExecStartPre=chattr -i /
-ExecStart=mkdir -p '%f'
-ExecStopPost=chattr +i /
-EOF
-
-sleep 1
-echo "Creating nix.mount"
-
-sudo tee /etc/systemd/system/nix.mount <<EOF
-[Unit]
-Description=Nix Package Manager
-DefaultDependencies=no
-After=mkdir-rootfs@nix.service
-Wants=mkdir-rootfs@nix.service
-Before=sockets.target
-After=ostree-remount.service
-BindsTo=var.mount
-
-[Mount]
-What=/var/lib/nix
-Where=/nix
-Options=bind
-Type=none
-EOF
-
-sleep 1
-echo "Enabling mount and resetting SELinux context"
-sleep 1
-
-sudo systemctl daemon-reload ; sudo systemctl enable nix.mount ; sudo systemctl start nix.mount ; sudo restorecon -RF /nix
-
-sleep 1
-
-echo "Temorarily setting SELinux to Permissive"
-
-sudo setenforce Permissive
-
-sleep 1
-
-echo "Preparing the nix install script"
-
-sleep 2
-
-sh <(curl -L https://nixos.org/nix/install) --daemon
-
-echo "Nix installer has finished running"
-sleep 1
-echo "Copying service files"
-
-sleep 1
-
-echo "Creating SSL cert file"
-sudo mkdir -p /etc/systemd/system/nix-daemon.service.d/
-sudo tee /etc/systemd/system/nix-daemon.service.d/override.conf <<EOF
-[Service]
-Environment="NIX_SSL_CERT_FILE=/etc/ssl/certs/ca-bundle.crt"
-EOF
-sudo rm -f /etc/systemd/system/nix-daemon.{service,socket} ; sudo cp /nix/var/nix/profiles/default/lib/systemd/system/nix-daemon.{service,socket} /etc/systemd/system/ ; sudo restorecon -RF /nix ; sudo systemctl daemon-reload ; sudo systemctl enable --now nix-daemon.socket
-
-sleep 1
-
-echo "Setting SELinux back to Enforcing"
-
-sudo setenforce Enforcing
-
-echo "Modifying /etc/nix/nix.conf"
-echo "experimental-features = nix-command flakes" | sudo tee -a /etc/nix/nix.conf
-
-sleep 1
-
-echo "Adding /etc/profile.d/nix-app-icons.sh"
-
-sudo rm -f /etc/profile.d/nix-app-icons.sh 
-sudo tee /etc/profile.d/nix-app-icons.sh <<EOF
-XDG_DATA_DIRS="$HOME/.nix-profile/share:/nix/var/nix/profiles/default/share:$XDG_DATA_DIRS"
-EOF
-
-sleep 1
-
-echo "Installing nix backup"
-
-sudo mkdir /opt/nixbackup
-sudo cp -R /nix /opt/nixbackup
-
-sudo tee /opt/nixbackup/reset-nix <<EOF
-#!/bin/bash
-sudo echo "Resetting nix..."
-sudo rm -rf /nix/*
-sudo mkdir -p /nix
-sudo cp -R /opt/nixbackup/nix/* /nix/
-sudo restorecon -RF /nix
-sudo echo "Nix has been reset. Reboot for changes to apply."
-EOF
-
-sudo chmod a+x /opt/nixbackup/reset-nix
-
-sudo echo "Finished installing nix backup"
-
-sleep 1
-
-echo "You MUST reboot in order for the installation to finish"
-echo "Reboot your system by typing:"
-echo "systemctl reboot"
\ No newline at end of file
diff --git a/usr/bin/ublue-nix-uninstall b/usr/bin/ublue-nix-uninstall
deleted file mode 100755
index 42e295deb5..0000000000
--- a/usr/bin/ublue-nix-uninstall
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/bash
-VERBOSITY="${VERBOSITY:-0}"
-SUDO_PROGRAM="${SUDO_PROGRAM:-sudo}"
-USER_WARNING="${USER_WARNING:-1}"
-[ "$VERBOSITY" = "1" ] && set -x
-set -uo pipefail
-
-function log {
-	LEVEL=$1
-	shift
-	echo "[${LEVEL}]" $@ >&2
-}
-
-if [ "$EUID" = 0 ] ; then
-  log WARNING "Do not run this command as root, as it won't delete proper files in your system"
-  exit
-fi
-
-if [ "$USER_WARNING" = 1 ] ; then
-	cat <<EOF
-This is a destructive operation, it will delete the following:
-
-Services:
-
-- nix-daemon.service
-- nix-daemon.socket
-- nix.mount
-- mkdir-rootfs@.service
-
-Files & Directories:
-
-- $HOME/{.nix-channels,.nix-defexpr,.nix-profile,.config/nixpkgs}
-- /etc/profile.d/nix-app-icons.sh
-- /etc/profile.d/nix.sh
-- /etc/nix
-- /etc/tmpfiles.d/nix-daemon.conf 
-- ~root/.nix-channels 
-- ~root/.nix-defexpr 
-- ~root/.nix-profile
-
-Users & Groups:
-
-- nixbld[0-32]
-
-If you are unsure about everything that will be done, make sure to read the source code of this script by running "cat $(realpath $0)" on your terminal.
-
-EOF
-
-	read -r -p "Are you sure you want to proceed? [y/N] " response
-	case "$response" in
-		[yY][eE][sS]|[yY]) 
-	        ;;
-		*)
-			exit
-		;;
-	esac
-fi
-
-log TASK 'Removing nix configuration from "\$HOME"'
-log TASK 'To finish removing everything, make sure to remove the '. "$HOME/.nix-profile/etc/profile.d/nix.sh"' line in your ~/.profile or ~/.bash_profile'
-
-rm -rf $HOME/{.nix-channels,.nix-defexpr,.nix-profile,.config/nixpkgs,.local/state/nix,.cache/nix}
-
-log TASK 'Deleting nix system users'
-for i in $(seq 1 32); do
-	"$SUDO_PROGRAM" userdel "nixbld$i"
-done
-"$SUDO_PROGRAM" groupdel 'nixbld'
-
-log TASK 'Removing nix systemd services'
-"$SUDO_PROGRAM" systemctl disable --now nix-daemon.service nix-daemon.socket nix.mount mkdir-rootfs@.service
-"$SUDO_PROGRAM" systemctl daemon-reload
-"$SUDO_PROGRAM" rm -rf '/etc/systemd/system/mkdir-rootfs@.service' '/etc/systemd/system/nix.mount' /etc/systemd/system/nix-daemon.{service,socket} '/etc/systemd/system/nix-daemon.service.d/'
-
-log TASK 'Removing remaining nix system configuration'
-"$SUDO_PROGRAM" rm -rf '/etc/profile.d/nix-app-icons.sh' '/etc/nix' '/etc/profile.d/nix.sh' '/etc/tmpfiles.d/nix-daemon.conf' ~root/.nix-channels ~root/.nix-defexpr ~root/.nix-profile
-"$SUDO_PROGRAM" cp -f '/etc/bashrc.backup-before-nix' '/etc/bashrc'
-
-log TASK 'Removing /var/lib/nix'
-"$SUDO_PROGRAM" restorecon -RF '/var/lib/nix'
-"$SUDO_PROGRAM" restorecon -RF '/nix'
-"$SUDO_PROGRAM" rm -rf '/var/lib/nix'
-
-log INFO 'Make sure to remove residual configurations from the following files:' "/etc/bash.bashrc /etc/bashrc /etc/profile /etc/zsh/zshrc /etc/zshrc $HOME/.bashr $HOME/.bash_profile $HOME/.zshrc $HOME/.profile"
-
-log INFO 'You may now reboot your system to confirm these changes with "systemctl reboot"'
diff --git a/usr/share/ublue-os/just/custom.just b/usr/share/ublue-os/just/custom.just
index 0b83707168..1d848316cc 100644
--- a/usr/share/ublue-os/just/custom.just
+++ b/usr/share/ublue-os/just/custom.just
@@ -1,3 +1,6 @@
+!include /usr/share/ublue-os/just/bling.just
+
+# install all flatpaks defined in recipe.yml
 setup-flatpaks:
   #!/usr/bin/env bash
   echo 'Installing flatpaks from the ublue recipe ...'
@@ -7,26 +10,4 @@ setup-flatpaks:
       flatpak install --user --noninteractive flathub $pkg; \
   done
 
-setup-gaming:
-  echo 'Setting up gaming experience ... lock and load.'
-  flatpak install -y --user \\
-  com.discordapp.Discord \\
-  com.feaneron.Boatswain \\
-  org.freedesktop.Platform.VulkanLayer.MangoHud//22.08 \\
-  org.freedesktop.Platform.VulkanLayer.OBSVkCapture//22.08 \\
-  org.freedesktop.Platform.VulkanLayer.vkBasalt//22.08 \\
-  com.heroicgameslauncher.hgl \\
-  com.obsproject.Studio \\
-  com.obsproject.Studio.Plugin.OBSVkCapture \\
-  com.obsproject.Studio.Plugin.Gstreamer \\
-  com.usebottles.bottles \\
-  com.valvesoftware.Steam \\
-  com.valvesoftware.Steam.Utility.gamescope \\
-  net.davidotek.pupgui2
-  flatpak override com.usebottles.bottles --user --filesystem=xdg-data/applications 
-  flatpak override --user --env=MANGOHUD=1 com.valvesoftware.Steam 
-  flatpak override --user --env=MANGOHUD=1 com.heroicgameslauncher.hgl 
-
-nix-me-up:
-  echo 'Setting phasers to kill. Installing nix.'
-  /usr/bin/ublue-nix-install
+# Include some of your custom scripts here! 
\ No newline at end of file