Merge pull request #45 from ublue-os/touchups

fix: More yafti and just fixes

system_files/deck/usr/share/ublue-os/firstboot/yafti.yml

@@ -25,44 +25,49 @@ screens:
           description: Launches Steam automatically on the desktop
           default: true
           packages:
-          - Enable Autostart: cp ~/usr/share/applications/steam.desktop ~/.config/autostart/steam-silent.desktop && sed -i 's@/usr/bin/steam-runtime  %U@/usr/bin/steam-runtime -silent %U@g' ~/.config/autostart/steam-silent.desktop
+          - Enable Autostart: cp /usr/share/applications/steam.desktop ~/.config/autostart/steam-silent.desktop && sed -i 's@/usr/bin/steam-runtime  %U@/usr/bin/steam-runtime -silent %U@g' ~/.config/autostart/steam-silent.desktop
         Decky Loader:
           description: A plugin loader for the Steam Deck
           default: false
           packages:
-          - Retrieve Decky: just get-decky
+          - Retrieve Decky: just --unstable get-decky
+        Chiaki4Deck:
+          description: PlayStation Remote Play
+          default: false
+          packages:
+          - Install Chiaki4Deck: just --unstable get-chiaki
         EmuDeck:
           description: |
             A utility for installing and configuring emulators on the Steam Deck
           default: false
           packages:
-          - Retrieve EmuDeck: just get-emudeck
+          - Retrieve EmuDeck: just --unstable get-emudeck
         Gamescope Autologin:
           description: Autologin to Gamescope Session
           default: true
           packages:
-          - Enable Gamescope Autologin: just enable-gamescope-autologin
+          - Enable Gamescope Autologin: just --unstable enable-gamescope-autologin
         Greenlight:
           description: A utility for xCloud and xHome streaming
           default: false
           packages:
-          - Retrieve Greenlight: just get-greenlight
+          - Retrieve Greenlight: just --unstable get-greenlight
         Kernel Arguments:
           description: Sets kernel arguments used in SteamOS
           default: true
           packages:
-          - Set kargs: just set-steamos-kargs
+          - Set kargs: just --unstable set-steamos-kargs
         Memory Tuning:
           description: Adjust ZRAM and configure deckswap
           default: false
           packages:
-          - Deck Swap: just swap-on
-          - Disable ZRAM: just zram-off
+          - Deck Swap: just --unstable swap-on
+          - Disable ZRAM: just --unstable zram-off
         Nix Package Manager:
           description: Nix is a powerful package manager for Linux and other Unix systems that makes package management reliable and reproducible
           default: true
           packages:
-          - Install Nix Package Support: guisu just install-nix
+          - Install Nix Package Support: just --unstable install-nix
         SteamDeckGyroDSU:
           description: Allows emulators and other applications to receive Steam Deck gyro motion data
           default: true
@@ -72,12 +77,12 @@ screens:
           description: Creates Steam desktop shortcuts
           default: true
           packages:
-          - Create Steam shortcuts: just create-steam-shortcuts
+          - Create Steam shortcuts: just --unstable create-steam-shortcuts
         Wallpaper Engine:
           description: Enables Wallpaper Engine
           default: true
           packages:
-          - Enable Wallpaper Engine: just enable-wallpaper-engine
+          - Enable Wallpaper Engine: just --unstable enable-wallpaper-engine
   can-we-modify-your-flatpaks:
     source: yafti.screen.consent
     values:
@@ -122,7 +127,6 @@ screens:
           default: false
           packages:
           - Bottles: com.usebottles.bottles
-          - Chiaki4Deck (PlayStation Remote Play): just get-chiaki
           - Discord: com.discordapp.Discord
           - GeForce NOW Electron: io.github.hmlendea.geforcenow-electron
           - Heroic Games Launcher (GOG & Epic): com.heroicgameslauncher.hgl

system_files/deck/usr/share/ublue-os/just/custom.just

@@ -1,3 +1,5 @@
+set shell := ["bash", "-c"]
+
 enable-gamescope-autologin:
   systemctl disable --now plasma-autologin
   systemctl enable --now gamescope-autologin
@@ -13,19 +15,19 @@ create-steam-shortcuts:
   cp /usr/share/applications/steam.desktop ~/Desktop
   cp /etc/skel.d/Desktop/Return.desktop ~/Desktop
 
-get-decky:
-  curl -L https://github.com/SteamDeckHomebrew/decky-installer/releases/latest/download/install_release.sh | sh
+get-decky: _auth
+  sudo curl -L https://github.com/SteamDeckHomebrew/decky-installer/releases/latest/download/install_release.sh | sh
 
 get-emudeck:
   echo 'Retrieving EmuDeck...'
   wget https://www.emudeck.com/EmuDeck.desktop -P ~/Desktop
   chmod +x ~/Desktop/EmuDeck.desktop
 
-install-nix:
-  curl -s https://raw.githubusercontent.com/dnkmmr69420/nix-installer-scripts/main/installer-scripts/silverblue-nix-installer.sh | bash
+install-nix: _auth
+  sudo curl -s https://raw.githubusercontent.com/dnkmmr69420/nix-installer-scripts/main/installer-scripts/silverblue-nix-installer.sh | bash
 
-remove-nix:
-  curl -s https://raw.githubusercontent.com/dnkmmr69420/nix-installer-scripts/main/uninstaller-scripts/silverblue-nix-uninstaller.sh | bash
+remove-nix: _auth
+  sudo curl -s https://raw.githubusercontent.com/dnkmmr69420/nix-installer-scripts/main/uninstaller-scripts/silverblue-nix-uninstaller.sh | bash
 
 get-greenlight:
   echo 'Retrieving Greenlight'
@@ -43,7 +45,6 @@ enable-wallpaper-engine:
   rm -rf /tmp/wallpaper-engine-kde-plugin
 
 deckswap-on:
-  #!/usr/bin/env bash
   STATUS=$(systemctl status deckswap.service)
   if grep 'inactive' <<< ${STATUS}; then
     systemctl enable deckswap.service
@@ -53,7 +54,6 @@ deckswap-on:
   fi
 
 deckswap-off:
-  #!/usr/bin/env bash
   STATUS=$(systemctl status deckswap.service)
   if grep -v 'inactive' <<< ${STATUS}; then
     systemctl disable deckswap.service
@@ -63,7 +63,6 @@ deckswap-off:
   fi
 
 resize-deckswap:
-  #!/usr/bin/env bash
   CONFIG='/etc/default/deckswap'
   CURRENT_SIZE=$(cat "${CONFIG}" | sed 's/SWAP_SIZE=//g')
   echo 'Current size: '${CURRENT_SIZE}
@@ -73,7 +72,7 @@ resize-deckswap:
       NEW_SIZE=1
     fi
     if ((${NEW_SIZE} >= 1 && ${NEW_SIZE} <= 16)); then
-      sudo sed -i 's/SWAP_SIZE='${CURRENT_SIZE}'G/SWAP_SIZE='${NEW_SIZE}'G/g' ${CONFIG}
+      just --unstable _auth | sudo sed -i 's/SWAP_SIZE='${CURRENT_SIZE}'G/SWAP_SIZE='${NEW_SIZE}'G/g' ${CONFIG}
       echo 'Current size: '${NEW_SIZE}'G. Please reboot.'
     else
       echo 'Error: Input out of range (1-16). Running again.'
@@ -85,7 +84,6 @@ resize-deckswap:
   fi
 
 zram-on:
-  #!/usr/bin/env bash
   KARGS=$(rpm-ostree kargs)
   if grep 'zram' <<< ${KARGS}; then
     rpm-ostree kargs --delete=zram
@@ -95,7 +93,6 @@ zram-on:
   fi
 
 zram-off:
-  #!/usr/bin/env bash
   KARGS=$(rpm-ostree kargs)
   if grep -v 'zram' <<< ${KARGS}; then
     rpm-ostree kargs --append=zram=0
@@ -105,7 +102,6 @@ zram-off:
   fi
 
 resize-zram:
-  #!/usr/bin/env bash
   CONFIG='/etc/systemd/zram-generator.conf'
   CURRENT_SIZE=$(cat "${CONFIG}" | sed 's/zram-size=//g')
   echo 'Current size: '${CURRENT_SIZE}
@@ -115,7 +111,7 @@ resize-zram:
       NEW_SIZE=1024
     fi
     if ((${NEW_SIZE} >= 512 && ${NEW_SIZE} <= 4096)); then
-      sudo sed -i 's/zram-size='${CURRENT_SIZE}'/zram-size='${NEW_SIZE}'/g' ${CONFIG}
+      just --unstable _auth | sudo sed -i 's/zram-size='${CURRENT_SIZE}'/zram-size='${NEW_SIZE}'/g' ${CONFIG}
       echo 'Current size: '${NEW_SIZE}'. Please reboot.'
     else
       echo 'Error: Input out of range (512-4096). Running again.'
@@ -125,3 +121,6 @@ resize-zram:
     echo 'Error: Input is not an integer. Running again.'
     just resize-zram
   fi
+
+_auth:
+  kdialog --password "Please enter your password: "

system_files/desktop/etc/profile.d/guisu.sh

@@ -1,2 +0,0 @@
-alias guisu="kdesu -u ${USER} -c"
-

system_files/desktop/usr/share/ublue-os/firstboot/yafti.yml

@@ -22,7 +22,7 @@ screens:
           condition:
             run: distrobox list | grep -v bazzite-arch
           packages:
-          - Install Bazzite Arch: just install-bazzite-arch
+          - Install Bazzite Arch: just --unstable install-bazzite-arch
           - Export Steam: distrobox-enter -n bazzite-arch -- '  distrobox-export --app steam'
           - Export Lutris: distrobox-enter -n bazzite-arch -- '  distrobox-export --app lutris'
           - Export Protontricks: distrobox-enter -n bazzite-arch -- '  distrobox-export --app protontricks'
@@ -32,31 +32,38 @@ screens:
           default: true
           packages:
           - Enable Duperemove: systemctl enable --now duperemove-weekly@$(systemd-escape $HOME).timer
+        CoreCtrl:
+          description: AMD GPU Overclocking
+          condition:
+            run: grep -v "nvidia" <<< $(rpm-ostree status)
+          default: false
+          packages:
+          - Install CoreCtrl: just --unstable install-corectrl
         Greenlight:
           description: A utility for xCloud and xHome streaming
           default: false
           packages:
-          - Retrieve Greenlight: just get-greenlight
+          - Retrieve Greenlight: just --unstable get-greenlight
         Memory Tuning:
           description: Adjust ZRAM configuration
           default: false
           packages:
-          - Disable ZRAM: just zram-off
+          - Disable ZRAM: just --unstable zram-off
         Nix Package Manager:
           description: Nix is a powerful package manager for Linux and other Unix systems that makes package management reliable and reproducible
           default: true
           packages:
-          - Install Nix Package Support: guisu just install-nix
+          - Install Nix Package Support: just --unstable install-nix
         System76 Scheduler:
           description: Enables System76 scheduler
           default: true
           packages:
-          - Enable System76 Scheduler: just enable-system76-scheduler
+          - Enable System76 Scheduler: just --unstable enable-system76-scheduler
         Wallpaper Engine:
           description: Enables Wallpaper Engine
           default: true
           packages:
-          - Enable Wallpaper Engine: just enable-wallpaper-engine
+          - Enable Wallpaper Engine: just --unstable enable-wallpaper-engine
   can-we-modify-your-flatpaks:
     source: yafti.screen.consent
     values:
@@ -172,7 +179,6 @@ screens:
           - Barrier: com.github.debauchee.barrier
           - Bitwarden: com.bitwarden.desktop
           - Calibre: com.calibre_ebook.calibre
-          - CoreCtrl (AMD GPU Overclocking): just install-corectrl
           - Fedora Media Writer: org.fedoraproject.MediaWriter
           - Flatseal Permissions Manager: com.github.tchx84.Flatseal
           - GIMP: org.gimp.GIMP

system_files/desktop/usr/share/ublue-os/just/custom.just

@@ -1,5 +1,6 @@
+set shell := ["bash", "-c"]
+
 install-bazzite-arch:
-  #!/usr/bin/env bash
   KARGS=$(rpm-ostree kargs)
   if grep 'nvidia' <<< ${KARGS}; then
     echo 'Installing Bazzite Arch (Nvidia)...'
@@ -13,11 +14,11 @@ install-corectrl:
   rpm-ostree install corectrl
   rpm-ostree kargs --append="amdgpu.ppfeaturemask=0xffffffff"
 
-install-nix:
-  curl -s https://raw.githubusercontent.com/dnkmmr69420/nix-installer-scripts/main/installer-scripts/silverblue-nix-installer.sh | bash
+install-nix: _auth
+  sudo curl -s https://raw.githubusercontent.com/dnkmmr69420/nix-installer-scripts/main/installer-scripts/silverblue-nix-installer.sh | bash
 
-remove-nix:
-  curl -s https://raw.githubusercontent.com/dnkmmr69420/nix-installer-scripts/main/uninstaller-scripts/silverblue-nix-uninstaller.sh | bash
+remove-nix: _auth
+  sudo curl -s https://raw.githubusercontent.com/dnkmmr69420/nix-installer-scripts/main/uninstaller-scripts/silverblue-nix-uninstaller.sh | bash
 
 get-greenlight:
   echo 'Retrieving Greenlight'
@@ -38,7 +39,6 @@ enable-wallpaper-engine:
   rm -rf /tmp/wallpaper-engine-kde-plugin
 
 zram-on:
-  #!/usr/bin/env bash
   KARGS=$(rpm-ostree kargs)
   if grep 'zram' <<< ${KARGS}; then
     rpm-ostree kargs --delete=zram
@@ -48,7 +48,6 @@ zram-on:
   fi
 
 zram-off:
-  #!/usr/bin/env bash
   KARGS=$(rpm-ostree kargs)
   if grep -v 'zram' <<< ${KARGS}; then
     rpm-ostree kargs --append=zram=0
@@ -58,7 +57,6 @@ zram-off:
   fi
 
 resize-zram:
-  #!/usr/bin/env bash
   CONFIG='/etc/systemd/zram-generator.conf'
   CURRENT_SIZE=$(cat "${CONFIG}" | sed 's/zram-size=//g')
   echo 'Current size: '${CURRENT_SIZE}
@@ -68,7 +66,7 @@ resize-zram:
       NEW_SIZE=1024
     fi
     if ((${NEW_SIZE} >= 512 && ${NEW_SIZE} <= 4096)); then
-      sudo sed -i 's/zram-size='${CURRENT_SIZE}'/zram-size='${NEW_SIZE}'/g' ${CONFIG}
+      just --unstable _auth | sudo sed -i 's/zram-size='${CURRENT_SIZE}'/zram-size='${NEW_SIZE}'/g' ${CONFIG}
       echo 'Current size: '${NEW_SIZE}'. Please reboot.'
     else
       echo 'Error: Input out of range (512-4096). Running again.'
@@ -78,3 +76,6 @@ resize-zram:
     echo 'Error: Input is not an integer. Running again.'
     just resize-zram
   fi
+
+_auth:
+  kdialog --password "Please enter your password: "