Move non-callable files of installation and cosmetic changes

bin/deploy

@@ -18,7 +18,7 @@ then
 fi
 
 
-source $DOTFILES_PATH/bin/util.zsh
+source $DOTFILES_PATH/bin/lib/util.zsh
 
 usage() {
   print "Usage: $cmdname [--via via_hostname] <hostname> [switch|boot|reboot|test|dry-activate|build]" >&2

bin/install

@@ -5,7 +5,7 @@ set -e
 set -u
 set -o pipefail
 
-source $DOTFILES_PATH/bin/util.zsh
+source $DOTFILES_PATH/bin/lib/util.zsh
 
 cmdname=$(basename $0)
 usage() {
@@ -46,7 +46,7 @@ local_temp_dir=$(mktemp --tmpdir --directory install-via.XXXXXXXXXX)
 trap "rm -rf $local_temp_dir" EXIT INT HUP TERM
 
 # Pre-build installation helper
-nix build --file $DOTFILES_PATH/bin/format.nix --argstr hostname "$hostname" --arg template "(import $MACHINES_PATH).machineTemplates.$hostname" --out-link "$local_temp_dir/format_$hostname"
+nix build --file $DOTFILES_PATH/bin/lib/format.nix --argstr hostname "$hostname" --arg template "(import $MACHINES_PATH).machineTemplates.$hostname" --out-link "$local_temp_dir/format_$hostname"
 
 if ! ssh -o VisualHostKey=yes root@$via_host true
 then
@@ -73,15 +73,17 @@ luks_key=""
 EOF
 luks_key=""
 
-nix copy --file $DOTFILES_PATH/bin/format.nix --argstr hostname "$hostname" --arg template "(import $MACHINES_PATH).machineTemplates.$hostname" --to ssh://root@$via_host
+nix copy --file $DOTFILES_PATH/bin/lib/format.nix --argstr hostname "$hostname" --arg template "(import $MACHINES_PATH).machineTemplates.$hostname" --to ssh://root@$via_host
 
 remote_temp_dir=$(ssh root@$via_host mktemp --tmpdir --directory install-via.XXXXXXXXXX)
 # copy install-helper and config
 scp -r $local_temp_dir/* root@$via_host:$remote_temp_dir/
 scp $DOTFILES_PATH/bin/message root@$via_host:$remote_temp_dir/
 
+ssh root@$via_host "$remote_temp_dir/message" &
+
 # -t: Force pseudo-terminal allocation
-ssh -t root@$via_host "$remote_temp_dir/format_$hostname/bin/format_$hostname" "$remote_temp_dir/config" "$remote_temp_dir/output.json" "$remote_temp_dir/message"
+ssh -t root@$via_host "$remote_temp_dir/format_$hostname/bin/format_$hostname" "$remote_temp_dir/config" "$remote_temp_dir/output.json"
 scp "root@$via_host:$remote_temp_dir/output.json" "$MACHINES_PATH/machines/$hostname/install-result.json"
 
 # TODO: ensure the working directory is set correctly
@@ -100,7 +102,9 @@ ssh root@$via_host "nixos-install --system $nixos_config_path && sync"
 ssh root@$via_host mkdir --mode u=rwx,g=,o= --parents /mnt/secrets/passwords
 
 # TODO: get host-specific password
-scp -r notThePassword root@$via_host:/mnt/secrets/passwords/root
-scp -r notThePassword root@$via_host:/mnt/secrets/passwords/jens
+#scp -r notThePassword root@$via_host:/mnt/secrets/passwords/root
+#scp -r notThePassword root@$via_host:/mnt/secrets/passwords/jens
+
+ssh root@$via_host sync
 
 print_info "Installation completed"

bin/format.nix → bin/lib/format.nix

@@ -39,13 +39,12 @@ assert (typeOf swap) == "string";
     set -e
     set -u
     set -o pipefail
-    set -x
 
     source ${./util.zsh}
 
     cmdname=$0
     usage() {
-      print "Usage: $cmdname <CONFIG_FILE> <OUTPUT_FILE> [<MESSAGE_PROGRAM>]" >&2
+      print "Usage: $cmdname <CONFIG_FILE> <OUTPUT_FILE>" >&2
     }
 
     print_info() {
@@ -80,7 +79,6 @@ assert (typeOf swap) == "string";
 
     config_file="$1"
     output_file="$2"
-    message_program="$3"
 
     # Before doing anything that could fail:
     # Set up tmpdir controlled by this script (and trap to remove it) and move the
@@ -130,12 +128,7 @@ assert (typeOf swap) == "string";
       exit 3
     fi
 
-    if [ -x $message_program ]
-    then
-      $message_program &
-    fi
-
-    print_info "Discarding disk contents..."
+    print_info "Discarding disk contents"
     if ${blkdiscard-bin} $block_device
     then
       ssd=true
@@ -165,7 +158,7 @@ assert (typeOf swap) == "string";
       system_partition="$block_device"3
     '' else abort "Invalid bootloader configured in template: ${template.bootloader}" }
 
-    print_info "Creating partitions..."
+    print_info "Creating partitions"
 
     ${mkfs-fat-bin} -F32 -n ESP "$esp_partition"
 
@@ -222,10 +215,16 @@ assert (typeOf swap) == "string";
     mkdir -p $mount_point/boot
     ${mount-bin} -o noatime $esp_partition $mount_point/boot
 
-    print_info "Generating NixOS hardware config..."
+    if [[ -d /nix/.rw-store ]]
+    then
+      print_info "Nix store tmpfs-rw-overlay detected, increasing tmpfs size"
+      mount -o remount,size=8G /nix/.rw-store
+    fi
+
+    print_info "Generating NixOS hardware config"
     nixos-generate-config --root $mount_point
 
-    print_info "Writing output..."
+    print_info "Writing output"
     > "$output_file" <<EOF
     {
       "installedBlockDevice": "$stable_block_device",
@@ -240,4 +239,4 @@ assert (typeOf swap) == "string";
 
     print_info "Installation stage 1 completed"
   '';
-}
+}
\ No newline at end of file

bin/message

@@ -18,7 +18,8 @@ reset() {
 }
 
 reset
-sleep 1
+sleep 1s
+reset
 
 # print character char by char
 for (( i=0; i<${#message}; i++ ))
@@ -30,7 +31,7 @@ done
 # keep screen clear of error messages
 while true
 do
-	sleep 10
+	sleep 10s
 	reset
 	print -n "${message}" > $tty
 done