From 2261f577c897ab833aba36feb38e9d0bdd83d486 Mon Sep 17 00:00:00 2001
From: "Jorge O. Castro" <jorge.castro@gmail.com>
Date: Fri, 17 Mar 2023 11:36:36 -0400
Subject: [PATCH] feat: switch over to determinate nix installer (#48)

---
 etc/nix/nix.conf    |  1 -
 usr/bin/nix-install | 21 +++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100644 etc/nix/nix.conf

diff --git a/etc/nix/nix.conf b/etc/nix/nix.conf
deleted file mode 100644
index 2c4e83fe7ed..00000000000
--- a/etc/nix/nix.conf
+++ /dev/null
@@ -1 +0,0 @@
-experimental-features = nix-command flakes
\ No newline at end of file
diff --git a/usr/bin/nix-install b/usr/bin/nix-install
index a3696932940..05ab5309ce2 100755
--- a/usr/bin/nix-install
+++ b/usr/bin/nix-install
@@ -3,16 +3,16 @@
 # thanks dnkmmr!
 
 sudo sleep 2
-echo "Adding selinux content to /nix"
+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"
+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
-echo "creating SSL cert file"
+echo "Creating SSL cert file"
 
 sudo tee /etc/systemd/system/nix-daemon.service.d/override.conf <<EOF
 [Service]
@@ -57,28 +57,28 @@ Type=none
 EOF
 
 sleep 1
-echo "Enabling mounting of /var/lib/nix to /nix and resetting SELinux context"
+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 "Temorarly setting SELinux to permissive"
+echo "Temorarily setting SELinux to Permissive"
 
 sudo setenforce Permissive
 
 sleep 1
 
-echo "Preparring the nix install script"
+echo "Preparing the nix install script"
 
 sleep 5
 
-sh <(curl -L https://nixos.org/nix/install) --daemon
+curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sh -s -- install --no-confirm 
 
 echo "Nix installer has finished running"
 sleep 1
-echo "Now copying service files"
+echo "Copying service files"
 
 sleep 1
 
@@ -86,11 +86,12 @@ sudo rm -f /etc/systemd/system/nix-daemon.{service,socket} ; sudo cp /nix/var/ni
 
 sleep 1
 
-echo "Now setting SELinux back to Enforcing"
+echo "Setting SELinux back to Enforcing"
 
 sudo setenforce Enforcing
 
 sleep 1
 
-echo "Reboot your system by typing"
+echo "You MUST reboot in order for the installation to finish"
+echo "Reboot your system by typing:"
 echo "systemctl reboot"