From 82591640c5a395962d529e9bc19eb41aea1cb1e2 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Mon, 22 Jan 2024 00:08:15 -0800 Subject: [PATCH] chore: Further justfile cleanup, split by DE and separate nvidia-only rules --- Containerfile | 2 + .../usr/share/ublue-os/just/90-bazzite-de | 8 ++++ .../usr/share/ublue-os/just/80-bazzite.just | 46 +------------------ .../usr/share/ublue-os/just/90-bazzite-de | 12 +++++ .../ublue-os/just/95-bazzite-nvidia.just | 5 ++ 5 files changed, 29 insertions(+), 44 deletions(-) create mode 100644 system_files/desktop/kinoite/usr/share/ublue-os/just/90-bazzite-de create mode 100644 system_files/desktop/silverblue/usr/share/ublue-os/just/90-bazzite-de create mode 100644 system_files/nvidia/shared/usr/share/ublue-os/just/95-bazzite-nvidia.just diff --git a/Containerfile b/Containerfile index 9366aa3b..4957f865 100644 --- a/Containerfile +++ b/Containerfile @@ -424,6 +424,7 @@ RUN /tmp/image-info.sh && \ cp "/usr/share/ublue-os/firstboot/yafti.yml" "/etc/yafti.yml" && \ echo "import \"/usr/share/ublue-os/just/80-bazzite.just\"" >> /usr/share/ublue-os/justfile && \ echo "import \"/usr/share/ublue-os/just/85-bazzite-image.just\"" >> /usr/share/ublue-os/justfile && \ + echo "import \"/usr/share/ublue-os/just/90-bazzite-de.just\"" >> /usr/share/ublue-os/justfile && \ pip install --prefix=/usr yafti && \ pip install --prefix=/usr topgrade && \ pip install --prefix=/usr hyfetch && \ @@ -707,6 +708,7 @@ RUN rm -rf \ /tmp/* \ /var/* && \ rm -f /usr/share/vulkan/icd.d/nouveau_icd.*.json && \ + echo "import \"/usr/share/ublue-os/just/95-bazzite-nvidia.just\"" >> /usr/share/ublue-os/justfile && \ mkdir -p /var/tmp && \ chmod -R 1777 /var/tmp && \ mkdir -p /var/lib/bluetooth && \ diff --git a/system_files/desktop/kinoite/usr/share/ublue-os/just/90-bazzite-de b/system_files/desktop/kinoite/usr/share/ublue-os/just/90-bazzite-de new file mode 100644 index 00000000..ff5f1c91 --- /dev/null +++ b/system_files/desktop/kinoite/usr/share/ublue-os/just/90-bazzite-de @@ -0,0 +1,8 @@ +# vim: set ft=make : + +# Restore Bazzite Breeze GTK4 theme +restore-bazzite-breeze-gtk-theme: + rm -f $HOME/.config/gtk-4.0/gtk.css + rm -f $HOME/.config/gtk-4.0/kde_window_geometry.css + cp /usr/etc/skel/.config/gtk-4.0/gtk.css $HOME/.config/gtk-4.0/gtk.css + cp /usr/etc/skel/.config/gtk-4.0/kde_window_geometry.css $HOME/.config/gtk-4.0/kde_window_geometry.css diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just b/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just index bd1f6dee..639c3ae2 100644 --- a/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just +++ b/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just @@ -156,16 +156,10 @@ patch-gmod: # Install Adwaita-for-Steam theme for CSS Loader (https://github.com/tkashkin/Adwaita-for-Steam) install-adwaita-for-steam: #!/usr/bin/bash - IMAGE_INFO="/usr/share/ublue-os/image-info.json" - BASE_IMAGE_NAME=$(jq -r '."base-image-name"' < $IMAGE_INFO) - if [[ ${BASE_IMAGE_NAME} == 'silverblue' ]]; then - if [ -d "$HOME/homebrew/themes" ]; then + if [ -d "$HOME/homebrew/themes" ]; then git clone https://github.com/tkashkin/Adwaita-for-Steam.git --single-branch "$HOME/homebrew/themes/Adwaita-for-Steam" - else + else echo 'Please install Decky Loader & CSS Loader first' - fi - else - echo "This is only supported under GNOME." fi # Force-enable AMD pstate @@ -521,42 +515,6 @@ remove-virtual-surround-71: rm ~/.config/pipewire/hrir_hesuvi/Control_Room_1.wav echo "Virtual Surround 7.1 removed, please reboot or restart pipewire for it to take effect." -# Restore Bazzite Breeze GTK4 theme (KDE Only) -restore-bazzite-breeze-gtk-theme: - rm -f $HOME/.config/gtk-4.0/gtk.css - rm -f $HOME/.config/gtk-4.0/kde_window_geometry.css - cp /usr/etc/skel/.config/gtk-4.0/gtk.css $HOME/.config/gtk-4.0/gtk.css - cp /usr/etc/skel/.config/gtk-4.0/kde_window_geometry.css $HOME/.config/gtk-4.0/kde_window_geometry.css - -# Blacklist K10 Temp and switch to Zenpower3 -switch-to-zenpower: - sudo bash -c 'sudo echo -e "\n# replaced with zenpower\nblacklist k10temp" >> /etc/modprobe.d/amdcpu.conf' - -# Restore Bazzite customized DE settings (GNOME only) -restore-gnome-de-settings: - #!/usr/bin/bash - IMAGE_INFO="/usr/share/ublue-os/image-info.json" - BASE_IMAGE_NAME=$(jq -r '."base-image-name"' < $IMAGE_INFO) - if [[ ${BASE_IMAGE_NAME} == 'silverblue' ]]; then - dconf load / < /usr/etc/dconf/db/local.d/02-bazzite-global - dconf load / < /usr/etc/dconf/db/local.d/03-bazzite-dash - dconf load / < /usr/etc/dconf/db/local.d/05-bazzite-extensions - dconf load / < /usr/etc/dconf/db/local.d/06-bazzite-theme - else - echo 'This command may only be used on GNOME.' - fi - -# Restore Bazzite customized applications folders (GNOME only) -restore-gnome-folders: - #!/usr/bin/bash - IMAGE_INFO="/usr/share/ublue-os/image-info.json" - BASE_IMAGE_NAME=$(jq -r '."base-image-name"' < $IMAGE_INFO) - if [[ ${BASE_IMAGE_NAME} == 'silverblue' ]]; then - dconf load / < /usr/etc/dconf/db/local.d/04-bazzite-folders - else - echo 'This command may only be used on GNOME.' - fi - # Create fedora distrobox if it doesn't exist [private] distrobox-check-fedora: diff --git a/system_files/desktop/silverblue/usr/share/ublue-os/just/90-bazzite-de b/system_files/desktop/silverblue/usr/share/ublue-os/just/90-bazzite-de new file mode 100644 index 00000000..e6bb2573 --- /dev/null +++ b/system_files/desktop/silverblue/usr/share/ublue-os/just/90-bazzite-de @@ -0,0 +1,12 @@ +# vim: set ft=make : + +# Restore Bazzite customized DE settings +restore-gnome-de-settings: + dconf load / < /usr/etc/dconf/db/local.d/02-bazzite-global + dconf load / < /usr/etc/dconf/db/local.d/03-bazzite-dash + dconf load / < /usr/etc/dconf/db/local.d/05-bazzite-extensions + dconf load / < /usr/etc/dconf/db/local.d/06-bazzite-theme + +# Restore Bazzite customized applications folders +restore-gnome-folders: + dconf load / < /usr/etc/dconf/db/local.d/04-bazzite-folders diff --git a/system_files/nvidia/shared/usr/share/ublue-os/just/95-bazzite-nvidia.just b/system_files/nvidia/shared/usr/share/ublue-os/just/95-bazzite-nvidia.just new file mode 100644 index 00000000..4fdb019d --- /dev/null +++ b/system_files/nvidia/shared/usr/share/ublue-os/just/95-bazzite-nvidia.just @@ -0,0 +1,5 @@ +# vim: set ft=make : + +# Enable Supergfxctl, a GPU switcher for hybrid laptops +enable-supergfxctl: + systemctl enable --now supergfxd.service