fix: Pass --no-confirm to nix install script

ublue-os · Aug 29, 2023 · dcf968d · dcf968d
1 parent 08e1574
commit dcf968d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 19 deletions.
diff --git a/system_files/deck/shared/usr/share/ublue-os/just/custom.just b/system_files/deck/shared/usr/share/ublue-os/just/custom.just
@@ -55,16 +55,12 @@ get-steamcmd:
 
 install-nix:
   #!/usr/bin/env bash
-  curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sh -s -- install
+  curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sudo bash -s -- install --no-confirm
   nix_systemd_file_location='/nix/var/nix/profiles/default'
-  if (( $EUID != 0 )); then
-      echo "This script must be ran as root"
-      exit 1
-  fi
-  rm -f /etc/systemd/system/nix-daemon.service
-  rm -f /etc/systemd/system/nix-daemon.socket
-  cp $nix_systemd_file_location/lib/systemd/system/nix-daemon.service /etc/systemd/system/nix-daemon.service
-  cp $nix_systemd_file_location/lib/systemd/system/nix-daemon.socket /etc/systemd/system/nix-daemon.socket
+  sudo rm -f /etc/systemd/system/nix-daemon.service
+  sudo rm -f /etc/systemd/system/nix-daemon.socket
+  sudo cp $nix_systemd_file_location/lib/systemd/system/nix-daemon.service /etc/systemd/system/nix-daemon.service
+  sudo cp $nix_systemd_file_location/lib/systemd/system/nix-daemon.socket /etc/systemd/system/nix-daemon.socket
 
 remove-nix:
   sudo /nix/nix-installer uninstall

diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/custom.just b/system_files/desktop/shared/usr/share/ublue-os/just/custom.just
@@ -46,17 +46,13 @@ install-corectrl:
 
 install-nix:
   #!/usr/bin/env bash
-  curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sh -s -- install
+  curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sudo bash -s -- install --no-confirm
   nix_systemd_file_location='/nix/var/nix/profiles/default'
-  if (( $EUID != 0 )); then
-      echo "This script must be ran as root"
-      exit 1
-  fi
-  rm -f /etc/systemd/system/nix-daemon.service
-  rm -f /etc/systemd/system/nix-daemon.socket
-  cp $nix_systemd_file_location/lib/systemd/system/nix-daemon.service /etc/systemd/system/nix-daemon.service
-  cp $nix_systemd_file_location/lib/systemd/system/nix-daemon.socket /etc/systemd/system/nix-daemon.socket
-
+  sudo rm -f /etc/systemd/system/nix-daemon.service
+  sudo rm -f /etc/systemd/system/nix-daemon.socket
+  sudo cp $nix_systemd_file_location/lib/systemd/system/nix-daemon.service /etc/systemd/system/nix-daemon.service
+  sudo cp $nix_systemd_file_location/lib/systemd/system/nix-daemon.socket /etc/systemd/system/nix-daemon.socket
+  
 remove-nix:
   sudo /nix/nix-installer uninstall