Merge branch 'master' into pnpm

jeff-hykin · jeff-hykin · commit 5146299bf24e · 2022-10-16T15:21:19.000-05:00
diff --git a/settings/extensions/nix/commands/ensure_nix_installed b/settings/extensions/nix/commands/ensure_nix_installed
@@ -17,34 +17,30 @@ color_reset="\e[0m";color_reset=""
 
 # saftey/cleanup
 # if trap exists
-if [ -n "$(command -v "trap")" ]
-then
+if [ -n "$(command -v "trap")" ]; then
     trap 'unset repo; unset branch; unset setup_or_copy; unset mixin_remote_name; return 0' INT TERM
 fi
 
 # 
-# if nix doesnt exist
+# if nix command doesnt exist
 # 
-if [ -z "$(command -v "nix")" ]
-then
+if [ -z "$(command -v "nix")" ]; then
     # 
     # try sourcing some files, then check avail if nix is available
     # 
-    if [ -f "/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh" ]
-    then
+    if [ -f "/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh" ]; then
         . "/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh"
     fi
-    if [ -f "$HOME/.nix-profile/etc/profile.d/nix.sh" ]
-    then
+    if [ -f "$HOME/.nix-profile/etc/profile.d/nix.sh" ]; then
         . "$HOME/.nix-profile/etc/profile.d/nix.sh"
     fi
     export PATH="$PATH:/nix/var/nix/profiles/default/bin/"
     
+    
     # 
-    # if nix STILL doesnt exist
+    # if nix store doesn't exist
     # 
-    if [ -z "$(command -v "nix")" ]
-    then
+    if ! [ -d "/nix/store" ]; then
         echo "|------------------------------------------------------|" 1>&2
         echo "|                                                      |" 1>&2
         echo "|    I'll try to install nix for you                   |" 1>&2
@@ -53,19 +49,16 @@ then
         echo "|------------------------------------------------------|" 1>&2
         echo ""
         # check for root
-        if [ "$(whoami)" = "root" ]
-        then
+        if [ "$(whoami)" = "root" ]; then
             echo "$light_yellow"
             echo "looks like you're logged in as root"
             echo "sadly nix can't install on the root user"
             echo "please use a regular user, then re-run this script"
             echo "$color_reset"
             # if users exists
-            if [ -n "$(command -v "getent")" ] && [ -n "$(command -v "cut")" ]
-            then
+            if [ -n "$(command -v "getent")" ] && [ -n "$(command -v "cut")" ]; then
                 users="$(getent passwd {1000..6000} | cut -d: -f1)"
-                if [ -n "$users" ] && [ "$users" != "root" ]
-                then
+                if [ -n "$users" ] && [ "$users" != "root" ]; then
                     echo "the available users are:"
                     echo "$users"
                     echo 
@@ -74,10 +67,9 @@ then
                 else
                     echo ""
                     echo "it looks like this system doesn't have any regular users"
-                    
+
                     # if useradd exists
-                    if [ -n "$(command -v "useradd")" ]
-                    then
+                    if [ -n "$(command -v "useradd")" ]; then
                         question="do you want me to make a regular user for you? [y/n]";answer=''
                         while true; do
                             echo "$question"; read response
@@ -87,12 +79,11 @@ then
                                 * ) echo "Please answer yes or no.";;
                             esac
                         done
-                        
+
                         if [ "$answer" = 'yes' ]; then
                             echo "${light_purple}Enter a username:${color_reset}"
                             read username
-                            if sudo useradd --create-home "$username" --password "password" --groups sudo
-                            then
+                            if sudo useradd --create-home "$username" --password "password" --groups sudo; then
                                 echo ""
                                 echo "user created successfully"
                                 echo "run:"
@@ -107,76 +98,75 @@ then
                             echo "Okay"
                         fi
                     fi
-                    
+
                 fi
                 echo ""
                 echo "login as the non-root user (${cyan}su USERNAME${color_reset})"
                 echo "then re-run this command"
                 exit
             fi
         fi
+
         #       
         # MacOS 
         #
-        if [ "$(uname)" = "Darwin" ]
-        then
+        if [ "$(uname)" = "Darwin" ]; then
             debugging_info="$debugging_info$newline""I think you have a Mac because "'"$OSTYPE" = "darwin"*'" came back true"
             full_version="$(sw_vers -productVersion)"
-            major_version="$(echo "$full_version" | sed -E 's/([0-9]+)\.[0-9]+\.[0-9]+/\1/g')"
-            minor_version="$(echo "$full_version" | sed -E 's/[0-9]+\.([0-9]+)\.[0-9]+/\1/g')"
+            major_version="$(echo "$full_version" | sed -E 's/([0-9]+)\.[0-9]+(\.[0-9]+)?/\1/g')"
+            minor_version="$(echo "$full_version" | sed -E 's/[0-9]+\.([0-9]+)(\.[0-9]+)?/\1/g')"
             #                  
             # Big Sur or Newer
             #                 
-            if [ "$major_version" = "11" ]; then
-                sh <(curl -Lk https://releases.nixos.org/nix/nix-2.3.7/install) --darwin-use-unencrypted-nix-store-volume
+            if [ "$major_version" = "11" ] || \
+                [ "$major_version" = "12" ] || \
+                [ "$major_version" = "13" ] || \
+                [ "$major_version" = "14" ] || \
+                [ "$major_version" = "15" ]; then
+                yes | bash <(curl -Lk https://releases.nixos.org/nix/nix-2.9.2/install) --darwin-use-unencrypted-nix-store-volume || sh <(curl -L https://nixos.org/nix/install) --daemon
             #                  
             # Older than Big Sur (Catalina, Mojave, High Siera, Siera, etc)
             #                 
-            elif [ "$major_version" -eq "10" ]; then
+            elif [ "$major_version" = "10" ]; then
                 # Catalina
                 if [ "$minor_version" = "15" ]; then
-                    sh <(curl -Lk https://releases.nixos.org/nix/nix-2.3.7/install) --darwin-use-unencrypted-nix-store-volume
+                    sh <(curl -Lk https://releases.nixos.org/nix/nix-2.9.2/install) --darwin-use-unencrypted-nix-store-volume
                 # Mojave, High Siera, Siera, and might work on even older versions (Yosemite, Mavericks)
                 else
                     # the single-user install seems to have fewer install issues
-                    curl -Lk https://releases.nixos.org/nix/nix-2.3.7/install | sh -s
-                    # curl -Lk https://releases.nixos.org/nix/nix-2.3.7/install | sh -s -- --daemon
+                    curl -Lk https://releases.nixos.org/nix/nix-2.9.2/install | sh -s
+                    # curl -Lk https://releases.nixos.org/nix/nix-2.9.2/install | sh -s -- --daemon
                 fi
             else
                 echo 'We tried to get you MacOS version by running `sw_vers -productVersion`'
                 echo '(which returns '"$full_version"')'
                 echo "Either 1. that value is empty 2. You're on an insanely old version 3. You're on a version way way in the future from when this script was made"
             fi
-        # assuming Linux/POSIX if not on MacOS
-        else
+        else # assuming Linux/POSIX if not on MacOS
             # if curl doesnt exist, try to make it exist
-            if [ -z "$(command -v "curl")" ]
-            then
+            if [ -z "$(command -v "curl")" ]; then
                 # if apt-get exists
-                if [ -n "$(command -v "apt-get")" ]
-                then
+                if [ -n "$(command -v "apt-get")" ]; then
                     sudo apt-get update && sudo apt-get install curl
                 else
                     echo "it looks like you don't have curl, please install curl then re-run this script" 1>&2
-                    echo "alternatively, to get nix, manually run the commands inside https://releases.nixos.org/nix/nix-2.3.7/install" 1>&2
+                    echo "alternatively, to get nix, manually run the commands inside https://releases.nixos.org/nix/nix-2.9.2/install" 1>&2
                 fi
             fi
-            
+
             # if now curl exists
-            if [ -n "$(command -v "curl")" ]
-            then
+            if [ -n "$(command -v "curl")" ]; then
                 # check if systemd exists
-                if pidof systemd
-                then
+                if pidof systemd; then
                     # the single-user install seems to have fewer install issues
-                    curl -Lk https://releases.nixos.org/nix/nix-2.3.7/install | sh -s
+                    curl -Lk https://releases.nixos.org/nix/nix-2.9.2/install | sh -s
                     # # multi-user install if systemd exists
-                    # curl -Lk https://releases.nixos.org/nix/nix-2.3.7/install | sh -s -- --daemon
+                    # curl -Lk https://releases.nixos.org/nix/nix-2.9.2/install | sh -s -- --daemon
                 else
                     # single-user install if systemd does not exist
-                    curl -Lk https://releases.nixos.org/nix/nix-2.3.7/install | sh -s
+                    curl -Lk https://releases.nixos.org/nix/nix-2.9.2/install | sh -s
                 fi
             fi
-        fi
+        fi    
     fi
 fi
diff --git a/settings/extensions/nix/commands/fix_ssl b/settings/extensions/nix/commands/fix_ssl
@@ -1,5 +1,26 @@
 #!/usr/bin/env bash
 
+# how to create up-to-date cert on MacOS
+# if [ "$(uname)" = "Darwin" ] 
+# then
+#     # check if file exists
+#     if ! [ -f "/etc/ssl/certs/ca-certificates.crt" ]
+#     then
+#         #
+#         # create an up-to-date cert with keychain
+#         #
+#         sudo mkdir -p /etc/ssl/certs/
+#         sudo rm -f /etc/ssl/certs/ca-certificates.crt
+#         sudo security export -t certs -f pemseq -k /System/Library/Keychains/SystemRootCertificates.keychain -o /etc/ssl/certs/ca-certificates.crt
+#         # force/ensure correct permissions on folders/files
+#         sudo chown root /etc /etc/ssl /etc/ssl/certs/ /etc/ssl/certs/ca-certificates.crt
+#         sudo chmod u=rwx,g=rx,o=rx /etc
+#         sudo chmod u=rwx,g=rx,o=rx /etc/ssl
+#         sudo chmod u=rwx,g=rx,o=rx /etc/ssl/certs/
+#         sudo chmod u=rw,g=r,o=r  /etc/ssl/certs/ca-certificates.crt
+#     fi
+# fi
+
 # if file exists, use it
 __temp_var__certs_file="$FORNIX_FOLDER/settings/extensions/nix/cacert.pem"
 if [ -f "$__temp_var__certs_file" ]
@@ -26,3 +47,17 @@ ca_certificate = $SSL_CERT_FILE" >> "$wgetrc_path"
     fi
 fi
 unset __temp_var__certs_file
+
+
+#
+# link cert into nix
+#
+nix_certificates_file="/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt" # not sure if different for single-user install
+# check if file exists
+if ! [ -f "$nix_certificates_file" ]
+then
+    echo "Creating nix certificate file: $nix_certificates_file"
+    sudo mkdir -p "$(dirname "$nix_certificates_file")"
+    # link into nix profile
+    sudo ln -s "$NIX_SSL_CERT_FILE" "$nix_certificates_file"
+fi
diff --git a/settings/extensions/nix/installer_helper b/settings/extensions/nix/installer_helper
@@ -8,6 +8,41 @@ then
     trap 'unset repo; unset branch; unset setup_or_copy; unset mixin_remote_name; return; exit 0' INT TERM
 fi
 
+
+# 
+# make sure xcode tools are installed on MacOS
+# 
+if [ "$(uname)" = "Darwin" ]
+then
+    # if non-interactive, then install without prompting
+    if [ -z "$PS1" ]; then
+        xcode-select -p &> /dev/null
+        if [ $? -ne 0 ]; then
+            echo "Command Line Tools for Xcode not found. Installing from softwareupdate…"
+            # This temporary file prompts the 'softwareupdate' utility to list the Command Line Tools
+            echo 
+            echo "This is probably going to take 5-30min to install" 
+            touch /tmp/.com.apple.dt.CommandLineTools.installondemand.in-progress;
+            PROD=$(softwareupdate -l | grep "\*.*Command Line" | tail -n 1 | sed 's/^[^C]* //')
+            softwareupdate -i "$PROD" --verbose;
+        else
+            echo "Command Line Tools for Xcode have been installed."
+        fi
+    # use prompt so the user sees a time estimate and progress
+    else
+        check=$((xcode-\select --install) 2>&1)
+        echo $check
+        str="xcode-select: note: install requested for command line developer tools"
+        while [[ "$check" == "$str" ]];
+        do
+           xcode-select --install
+           echo "waiting for xcode command line tools to be installed"
+           sleep 10
+        done
+    fi
+    echo "passed xcode tools installed"
+fi
+
 # TODO: add a check/option for a corrupted nix install
 
 if ! [ -d "/nix/store" ]
diff --git a/settings/extensions/nix/nix.toml b/settings/extensions/nix/nix.toml
@@ -438,7 +438,7 @@ from = "c00039f697caa02208a01e7712bfe11c484cceca"
 # 
 [[packages]]
 load = [ "deno",]
-from = "c82b46413401efa740a0b994f52e9903a4f6dcd5"
+from = "ce6aa13369b667ac2542593170993504932eb836"
 
 [[packages]]
 load = [ "nix",]
diff --git a/settings/extensions/nix/packages/salt.nix b/settings/extensions/nix/packages/salt.nix
diff --git a/settings/extensions/nix/shell.nix b/settings/extensions/nix/shell.nix
@@ -130,7 +130,6 @@ in
                 main.project
                 linuxOnly
                 macOnly
-                (snowball "https://raw.githubusercontent.com/jeff-hykin/snowball/3df028e5d9e92dbe077ce34f6907da852e61895a/").nixShell
                 # an "inline" mixin (this is what each mixin looks like)
                 ({
                     # inside that shell, make sure to use these packages

Original file line number	Diff line number	Diff line change
`@@ -438,7 +438,7 @@ from = "c00039f697caa02208a01e7712bfe11c484cceca"`
`438`	`438`	`#`
`439`	`439`	`[[packages]]`
`440`	`440`	`load = [ "deno",]`
`441`		`-from = "c82b46413401efa740a0b994f52e9903a4f6dcd5"`
	`441`	`+from = "ce6aa13369b667ac2542593170993504932eb836"`
`442`	`442`
`443`	`443`	`[[packages]]`
`444`	`444`	`load = [ "nix",]`