From a021f639c14de5a696d11d06510ed26fbf70382c Mon Sep 17 00:00:00 2001
From: cmacrae <calum0macrae@gmail.com>
Date: Wed, 31 May 2017 21:08:36 +0100
Subject: [PATCH 1/6] bootstrap: initial commit
---
bootstrap.sh | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 133 insertions(+)
create mode 100755 bootstrap.sh
diff --git a/bootstrap.sh b/bootstrap.sh
new file mode 100755
index 00000000..3d7fddf8
--- /dev/null
+++ b/bootstrap.sh
@@ -0,0 +1,133 @@
+#! /usr/bin/env bash
+set -e
+set -o pipefail
+
+# Sanity checks
+sanity(){
+ # Ensure the script is running on macOS
+ if [ $(uname -s) != "Darwin" ]; then
+ echo "This script is for use with macOS!"
+ exit 1
+ fi
+
+ # Ensure script is not being run with root privileges
+ if [ $EUID -eq 0 ]; then
+ echo "Please don't run this script with root privileges!"
+ exit 1
+ fi
+
+ # Ensure Nix has already been installed
+ if [[ ! $(type nix-env 2>/dev/null) ]]; then
+ echo -e "Cannot find "$YELLOW"nix-env"$ESC" in the PATH"
+ echo "Please ensure you've installed and configured your Nix environment correctly"
+ echo -e "Install instructions can be found at: "$BLUE_UL"https://nixos.org/nix/manual/#chap-quick-start"$ESC""
+ exit 1
+ fi
+
+ # Check if nix-darwin is already present
+ if [[ $(type darwin-rebuild 2>/dev/null) ]]; then
+ echo -e "It looks like "$YELLOW"nix-darwin"$ESC" is already installed..."
+ exit 1
+ fi
+}
+
+# Exit with message
+exit_message(){
+ echo -e ""$RED"$1"$ESC"" >&2
+ exit 1
+}
+
+# Installer
+install(){
+ echo -e ""$BLUE"Welcome to the nix-darwin installer!"$ESC""
+
+ # Prompt for nix package upgrade
+ echo -e "Ensuring "$YELLOW"nixpkgs"$ESC" version meets requirements..."
+ echo -e "To do this, the following will be run to upgrade the "$YELLOW"nix"$ESC" package:"
+ echo -e ""$YELLOW"nix-env -iA nixpkgs.nix"$ESC"\n"
+ echo "If you have a recent install of Nix, this may not be necessary, but should not cause any harm to run"
+ while true ; do
+ read -p "Would you like to upgrade? [y/n] " ANSWER
+ case $ANSWER in
+ y|Y)
+ echo "Proceeding with upgrade..."
+ nix-env -iA nixpkgs.nix
+ break
+ ;;
+ n|N)
+ echo "Proceeding without upgrading..."
+ break
+ ;;
+ *)
+ echo "Please answer 'y' or 'n'..."
+ esac
+ done
+
+ # Prompt for initial sudo password & keep alive
+ echo "Please enter your password for sudo authentication"
+ sudo -k
+ sudo echo "sudo authenticaion successful!"
+ while true ; do sudo -n true ; sleep 60 ; kill -0 "$$" || exit ; done 2>/dev/null &
+
+
+ # Link run directory
+ echo "Setting up /run..."
+ test -L /run || sudo ln -s /private/var/run /run
+
+ # Fetch the nix-darwin repo as a zip (shouldn't assume presence of git)
+ REPO_DOWNLOAD=/tmp/nix-darwin-$(date +%Y%m%d).zip
+ if [ ! -f $REPO_DOWNLOAD ]; then
+ echo -e ""$YELLOW"Fetching nix-darwin repo..."$ESC""
+ curl -Lo $REPO_DOWNLOAD https://github.com/LnL7/nix-darwin/archive/master.zip || \
+ exit_message "Problem downloading nix-darwin repo"
+ fi
+
+ # Extract the repository
+ echo -e "Extracting repo to "$YELLOW"~/.nix-defexpr/darwin"$ESC"..."
+ mkdir -p ~/.nix-defexpr
+ cd ~/.nix-defexpr
+ unzip -q $REPO_DOWNLOAD && echo -e ""$GREEN"Success!"$ESC""
+ mv nix-darwin-master darwin
+ cd - &> /dev/null
+
+ # Copy the example configuration
+ echo -e "Copying example configuration to "$YELLOW"~/.nixpkgs/darwin-configuration.nix"$ESC"..."
+ mkdir -p ~/.nixpkgs
+ cp ~/.nix-defexpr/darwin/modules/examples/simple.nix ~/.nixpkgs/darwin-configuration.nix
+
+ # Bootstrap build using default nix.nixPath
+ echo "Bootstrapping..."
+ export NIX_PATH=darwin=$HOME/.nix-defexpr/darwin:darwin-config=$HOME/.nixpkgs/darwin-configuration.nix:$NIX_PATH
+ $(nix-build '<darwin>' -A system --no-out-link)/sw/bin/darwin-rebuild build
+ $(nix-build '<darwin>' -A system --no-out-link)/sw/bin/darwin-rebuild switch
+
+ # Source generated bashrc
+ . /etc/static/bashrc
+
+ # Run first darwin-rebuild switch
+ echo -e "Running first "$YELLOW"darwin-rebuild switch"$ESC"..."
+ darwin-rebuild switch && echo -e ""$GREEN"Success!"$ESC"" || exit_message "Problem running darwin-rebuild switch"
+
+ echo -e ""$BLUE"You're all done!"$ESC""
+ echo -e "Take a look at "$YELLOW"~/.nixpkgs/darwin-configuration.nix"$ESC" to get started."
+ echo -e "See the README for more information: "$BLUE_UL"https://github.com/LnL7/nix-darwin/blob/master/README.md"$ESC""
+}
+
+main(){
+ # ANSI properties/colours
+ local ESC='\033[0m'
+ local BLUE='\033[38;34m'
+ local BLUE_UL='\033[38;4;34m'
+ local GREEN='\033[38;32m'
+ local GREEN_UL='\033[38;4;32m'
+ local RED='\033[38;31m'
+ local RED_UL='\033[38;4;31m'
+ local YELLOW='\033[38;33m'
+ local YELLOW_UL='\033[38;4;33m'
+
+ sanity
+ install
+}
+
+# Actual run
+main
From bfb6ae05aaef00154671c5f77d31e1de3273bcf7 Mon Sep 17 00:00:00 2001
From: cmacrae <calum0macrae@gmail.com>
Date: Thu, 1 Jun 2017 22:58:09 +0100
Subject: [PATCH 2/6] bootstrap: keep echo consistent
---
bootstrap.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bootstrap.sh b/bootstrap.sh
index 3d7fddf8..fa6ae895 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -55,7 +55,7 @@ install(){
break
;;
n|N)
- echo "Proceeding without upgrading..."
+ echo "Proceeding without upgrade..."
break
;;
*)
From 7075538f7ec11565c655a7496978265d561177e7 Mon Sep 17 00:00:00 2001
From: cmacrae <calum0macrae@gmail.com>
Date: Thu, 1 Jun 2017 22:59:39 +0100
Subject: [PATCH 3/6] bootstrap: build user options/fetch repo with
nix-prefetch-url
---
bootstrap.sh | 157 ++++++++++++++++++++++++++++++++++++++++++---------
1 file changed, 129 insertions(+), 28 deletions(-)
diff --git a/bootstrap.sh b/bootstrap.sh
index fa6ae895..eb34b69e 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -2,6 +2,38 @@
set -e
set -o pipefail
+# Argument parsing
+init(){
+ if [ $# -gt 0 ]; then
+ case "$1" in
+ -h|--help)
+ usage
+ exit 1
+ ;;
+ -u|--create-daemon-users)
+ export CREATE_DAEMON_USERS=true
+ ;;
+ *)
+ echo -e "ERROR: Unrecognized parameter: '${1}'\nSee usage (--help) for options..." 1>&2
+ exit 1
+ ;;
+ esac
+ fi
+}
+
+# Usage
+usage(){
+ cat <<EOF
+ Usage: bootstrap.sh [Options]
+
+ Options:
+
+ -h, --help: Show this message
+ -u, --create-daemon-users: Create users & group for use with the Nix daemon
+EOF
+}
+
+
# Sanity checks
sanity(){
# Ensure the script is running on macOS
@@ -27,7 +59,7 @@ sanity(){
# Check if nix-darwin is already present
if [[ $(type darwin-rebuild 2>/dev/null) ]]; then
echo -e "It looks like "$YELLOW"nix-darwin"$ESC" is already installed..."
- exit 1
+ [ ! -z $CREATE_DAEMON_USERS ] && create_daemon_users || exit 1
fi
}
@@ -37,9 +69,63 @@ exit_message(){
exit 1
}
+# Prompt for sudo password & keep alive
+sudo_prompt(){
+ echo "Please enter your password for sudo authentication"
+ sudo -k
+ sudo echo "sudo authenticaion successful!"
+ while true ; do sudo -n true ; sleep 60 ; kill -0 "$$" || exit ; done 2>/dev/null &
+}
+
+# Daemon setup
+create_daemon_users(){
+ echo -e ""$BLUE"Nix daemon user/group configuration"$ESC""
+ sudo_prompt
+
+ # If the group exists, dscl returns exit code 56.
+ # Since this is not strictly an error code, standard code
+ # checking doesn't work as intended.
+ /usr/bin/dscl . -read /Groups/nixbld &> /dev/null
+ retCode=$?
+ if [[ $retCode != 0 ]]; then
+ echo -e "Creating the "$YELLOW"nixbld"$ESC" group..."
+ sudo /usr/sbin/dseditgroup -o create -r "Nix build group for nix-daemon" -i 30000 nixbld >&2 || \
+ exit_message "Problem creating group: nixbld"
+ else
+ echo -e "It looks like the "$YELLOW"nixbld"$ESC" group already exists!"
+ fi
+
+ for i in {1..10}; do
+ /usr/bin/id nixbld${i} &> /dev/null
+ retCode=$?
+ if [[ $retCode != 0 ]]; then
+ echo -e "Creating user: "$YELLOW"nixbld${i}"$ESC"..."
+ sudo /usr/sbin/sysadminctl -fullName "Nix build user $i" \
+ -home /var/empty \
+ -shell /sbin/nologin \
+ -UID $(expr 30000 + $i) \
+ -addUser nixbld$i >&2 \
+ || exit_message "Problem creating user: nixbld${i}"
+
+ sudo dscl . -create /Users/nixbld$i IsHidden 1 || \
+ exit_message "Problem setting 'IsHidden' for user: nixbld${i}"
+ sudo dscl . -create /Users/nixbld$i UserShell /sbin/nologin || \
+ exit_message "Problem setting shell for user: nixbld${i}"
+ sudo /usr/sbin/dseditgroup -o edit -t user -a nixbld$i nixbld || \
+ exit_message "Problem setting primary group for user: nixbld${i}"
+ sudo /usr/bin/dscl . -create /Users/nixbld$i PrimaryGroupID 30000 >&2 || \
+ exit_message "Problem setting PrimaryGroupID for user: nixbld${i}"
+ else
+ echo -e "It looks like the "$YELLOW"nixbld${i}"$ESC" user already exists!"
+ fi
+ done
+
+ [ ! -z $CREATE_DAEMON_USERS ] && exit 0
+}
+
# Installer
install(){
- echo -e ""$BLUE"Welcome to the nix-darwin installer!"$ESC""
+ echo -e ""$BLUE_UL"Welcome to the nix-darwin installer!"$ESC""
# Prompt for nix package upgrade
echo -e "Ensuring "$YELLOW"nixpkgs"$ESC" version meets requirements..."
@@ -63,37 +149,26 @@ install(){
esac
done
- # Prompt for initial sudo password & keep alive
- echo "Please enter your password for sudo authentication"
- sudo -k
- sudo echo "sudo authenticaion successful!"
- while true ; do sudo -n true ; sleep 60 ; kill -0 "$$" || exit ; done 2>/dev/null &
-
+ sudo_prompt
# Link run directory
echo "Setting up /run..."
- test -L /run || sudo ln -s /private/var/run /run
+ test -L /run || sudo ln -snf private/var/run /run
- # Fetch the nix-darwin repo as a zip (shouldn't assume presence of git)
- REPO_DOWNLOAD=/tmp/nix-darwin-$(date +%Y%m%d).zip
- if [ ! -f $REPO_DOWNLOAD ]; then
- echo -e ""$YELLOW"Fetching nix-darwin repo..."$ESC""
- curl -Lo $REPO_DOWNLOAD https://github.com/LnL7/nix-darwin/archive/master.zip || \
- exit_message "Problem downloading nix-darwin repo"
- fi
-
- # Extract the repository
- echo -e "Extracting repo to "$YELLOW"~/.nix-defexpr/darwin"$ESC"..."
- mkdir -p ~/.nix-defexpr
- cd ~/.nix-defexpr
- unzip -q $REPO_DOWNLOAD && echo -e ""$GREEN"Success!"$ESC""
- mv nix-darwin-master darwin
- cd - &> /dev/null
+ # Fetch the nix-darwin repo
+ echo -e ""$YELLOW"Fetching nix-darwin repo..."$ESC""
+ nix-env -p "/nix/var/nix/profiles/per-user/$USER/darwin" \
+ --set $(nix-prefetch-url --unpack --print-path \
+ --name nix-darwin-17.03 \
+ https://github.com/LnL7/nix-darwin/archive/master.tar.gz \
+ | grep nix-darwin)
+ ln -sfn "/nix/var/nix/profiles/per-user/$USER/darwin" "$HOME/.nix-defexpr/darwin"
# Copy the example configuration
echo -e "Copying example configuration to "$YELLOW"~/.nixpkgs/darwin-configuration.nix"$ESC"..."
- mkdir -p ~/.nixpkgs
- cp ~/.nix-defexpr/darwin/modules/examples/simple.nix ~/.nixpkgs/darwin-configuration.nix
+
+ mkdir -p "$HOME/.nixpkgs"
+ cp "$HOME/.nix-defexpr/darwin/modules/examples/simple.nix" "$HOME/.nixpkgs/darwin-configuration.nix"
# Bootstrap build using default nix.nixPath
echo "Bootstrapping..."
@@ -108,7 +183,32 @@ install(){
echo -e "Running first "$YELLOW"darwin-rebuild switch"$ESC"..."
darwin-rebuild switch && echo -e ""$GREEN"Success!"$ESC"" || exit_message "Problem running darwin-rebuild switch"
- echo -e ""$BLUE"You're all done!"$ESC""
+ echo -e ""$BLUE_UL"Nix daemon"$ESC""
+ echo "Optionally, this script can also create the group and users"
+ echo -e "needed for running the Nix "$YELLOW"multi-user support daemon"$ESC"."
+ echo "If you're unfamiliar with the Nix daemon, see:"
+ echo -e ""$BLUE_UL"http://nixos.org/nix/manual/#sec-nix-daemon\n"$ESC""
+ echo "If you decide not to, but later change your mind, you can always re-run"
+ echo -e "this script with "$YELLOW"-u"$ESC" or "$YELLOW"--create-daemon-users"$ESC""
+
+ while true ; do
+ read -p "Would you like to create the Nix daemon group/users? [y/n] " ANSWER
+ case $ANSWER in
+ y|Y)
+ create_daemon_users
+ break
+ ;;
+ n|N)
+ echo "Not creating Nix daemon group/users"
+ break
+ ;;
+ *)
+ echo "Please answer 'y' or 'n'..."
+ esac
+ done
+
+ # Finish
+ echo -e ""$GREEN"You're all done!"$ESC""
echo -e "Take a look at "$YELLOW"~/.nixpkgs/darwin-configuration.nix"$ESC" to get started."
echo -e "See the README for more information: "$BLUE_UL"https://github.com/LnL7/nix-darwin/blob/master/README.md"$ESC""
}
@@ -125,9 +225,10 @@ main(){
local YELLOW='\033[38;33m'
local YELLOW_UL='\033[38;4;33m'
+ init $@
sanity
install
}
# Actual run
-main
+main $@
From 30ae060482dcad0001a87933e3b74d8e07e6a7de Mon Sep 17 00:00:00 2001
From: cmacrae <calum0macrae@gmail.com>
Date: Fri, 2 Jun 2017 15:43:38 +0100
Subject: [PATCH 4/6] boostrap: Prompt for sudo in create_daemon_users if
non-interactive
---
bootstrap.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bootstrap.sh b/bootstrap.sh
index eb34b69e..c011ed37 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -80,7 +80,7 @@ sudo_prompt(){
# Daemon setup
create_daemon_users(){
echo -e ""$BLUE"Nix daemon user/group configuration"$ESC""
- sudo_prompt
+ [ ! -z $CREATE_DAEMON_USERS ] && sudo_prompt
# If the group exists, dscl returns exit code 56.
# Since this is not strictly an error code, standard code
From 4c6d8dc3a64c19836caec6208d4d66a58ea677f2 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 3 Jun 2017 10:56:24 +0200
Subject: [PATCH 5/6] bootstrap: remove -shell flag for sysadminctl
Fixes creation of build users on 10.11
---
bootstrap.sh | 1 -
1 file changed, 1 deletion(-)
diff --git a/bootstrap.sh b/bootstrap.sh
index c011ed37..c94570d6 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -102,7 +102,6 @@ create_daemon_users(){
echo -e "Creating user: "$YELLOW"nixbld${i}"$ESC"..."
sudo /usr/sbin/sysadminctl -fullName "Nix build user $i" \
-home /var/empty \
- -shell /sbin/nologin \
-UID $(expr 30000 + $i) \
-addUser nixbld$i >&2 \
|| exit_message "Problem creating user: nixbld${i}"
From 310ec896421d2af980e63b137903806151e61e4b Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 3 Jun 2017 11:02:27 +0200
Subject: [PATCH 6/6] bootstrap: use nix-channel
---
bootstrap.sh | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/bootstrap.sh b/bootstrap.sh
index c94570d6..7febc3e3 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -155,19 +155,20 @@ install(){
test -L /run || sudo ln -snf private/var/run /run
# Fetch the nix-darwin repo
- echo -e ""$YELLOW"Fetching nix-darwin repo..."$ESC""
- nix-env -p "/nix/var/nix/profiles/per-user/$USER/darwin" \
- --set $(nix-prefetch-url --unpack --print-path \
- --name nix-darwin-17.03 \
- https://github.com/LnL7/nix-darwin/archive/master.tar.gz \
- | grep nix-darwin)
- ln -sfn "/nix/var/nix/profiles/per-user/$USER/darwin" "$HOME/.nix-defexpr/darwin"
+ echo -e ""$YELLOW"Configuring darwin channel..."$ESC""
+ nix-channel --add https://github.com/LnL7/nix-darwin/archive/master.tar.gz darwin
+ nix-channel --update
+ # Create symlink for old NIX_PATH entry
+ ln -sfn "/nix/var/nix/profiles/per-user/$USER/channels/darwin" "$HOME/.nix-defexpr/darwin"
# Copy the example configuration
echo -e "Copying example configuration to "$YELLOW"~/.nixpkgs/darwin-configuration.nix"$ESC"..."
- mkdir -p "$HOME/.nixpkgs"
- cp "$HOME/.nix-defexpr/darwin/modules/examples/simple.nix" "$HOME/.nixpkgs/darwin-configuration.nix"
+ if [ ! -e "$HOME/.nixpkgs/darwin-configuration.nix" ]; then
+ mkdir -p "$HOME/.nixpkgs"
+ cp "$HOME/.nix-defexpr/darwin/modules/examples/simple.nix" "$HOME/.nixpkgs/darwin-configuration.nix"
+ chmod u+w "$HOME/.nixpkgs/darwin-configuration.nix"
+ fi
# Bootstrap build using default nix.nixPath
echo "Bootstrapping..."