Reboot before creating users

lib/modules/packages/oh-my-posh.nix

@@ -9,19 +9,14 @@
       { config, ... }: {
         options = {
           source = mkOption {
-            type = types.nullOr types.path;
+            type = types.path;
             description = "The path to the oh-my-posh theme to use.";
-            default = null;
           };
 
           name = mkOption {
             type = types.nullOr types.str;
             description = "The name of the theme.";
-            default = if (config.source != null)
-            then
-              lib.strings.removeSuffix ".omp" (lib.strings.removeSuffix ".json" (builtins.baseNameOf config.source))
-            else
-              null;
+            default = lib.strings.removeSuffix ".omp" (lib.strings.removeSuffix ".json" (builtins.baseNameOf config.source));
           };
         };
       });
@@ -30,9 +25,9 @@
       { config, ... }: {
         options = {
           theme = mkOption {
-            type = types.either types.str themeType;
+            type = types.nullOr (types.either types.str themeType);
             description = "The default theme.";
-            default = {};
+            default = null;
           };
 
           additionalThemes = mkOption {

lib/modules/partition/disks.nix

@@ -8,6 +8,7 @@
     fs = import ./fs.nix;
 
     diskListVarName = "myDisks";
+    probeScript = "partprobe 2> /dev/null || true";
     isSwap = partition: builtins.elem partition.type [fs.swap 19];
 
     mkDiskType = osDisk: types.submodule (
@@ -136,19 +137,12 @@
 
                   create = lib.strings.concatLines [
                     (appendScript "${toString index}: \"$(${sizeOption})\" type=${mkType type}")
-                    # Wait for partition to be detected
-                    ''echo "Waiting for ${partVar} to appear..."''
-                    ''
-                      while true;
-                      do
-                        [ -b ${partVar} ] && break;
-                      done;
-                    ''
+                    probeScript
                     "sudo ${formatScripts.${format}}"
                   ];
 
                   fallback = ''
-                    if ! { ls "${diskVar}"?(p)${toString index} 2>&1; } > /dev/null
+                    if ! { ls "${partVar}" 2>&1; } > /dev/null
                     then
                       ${create}
                     fi
@@ -329,13 +323,7 @@
               mountScript = lib.strings.concatLines (
                 builtins.concatMap
                   (_: [
-                  ''echo "Waiting for "${lib.strings.escapeShellArg (partPath _)}" to appear..."''
-                  ''
-                    while true;
-                    do
-                      [ -b ${lib.strings.escapeShellArg (partPath _)} ] && break
-                    done
-                  ''
+                    probeScript
                     (builtins.concatStringsSep " " [
                       "sudo"
                       "mount"
@@ -351,13 +339,20 @@
 
               swapScript = lib.strings.concatLines (
                 builtins.map
-                  (_: "sudo swapon ${partPath _}")
+                  (_: ''
+                    ${probeScript}
+                    sudo swapon ${partPath _}
+                  '')
                   (builtins.filter (_: _.useSwap) partitions));
-            in lib.strings.concatLines (
-              (builtins.map (_: _.deviceScript) disks) ++ lib.optionals ((builtins.length disks) > 0) [
+            in lib.strings.concatLines ([
+                "#!/bin/bash"
+                "set -o errexit"
+              ] ++
+              (builtins.map (_: _.deviceScript) disks) ++
+              lib.optionals ((builtins.length disks) > 0) [
                 ". ${./../../../scripts/Common/Scripts/is-truthy.sh}"
                 ''echo "$(tput setaf 3)==== WARNING ====$(tput sgr0)"''
-                (''echo "Continuing this script will wipe the contents of '' + (
+                (''echo "Continuing this script will alter the partitions of '' + (
                   lib.strings.concatStringsSep ", " (builtins.map (_: "${_.deviceVariable}") (lib.lists.init disks))
                 ) + (if (builtins.length disks) > 1 then " and " else "") + (lib.lists.last disks).deviceVariable + ''"'')
                 ''read -p "Are you sure you want to continue? [y/n] " answer''

profiles/users/manuel/manuel.omp.json

@@ -29,7 +29,7 @@
                     "properties": {
                         "display_host": false
                     },
-                    "template": " {{ if .SSHSession }}\ueb39 {{ end }}{{ .UserName }} "
+                    "template": "{{ if .SSHSession }}\ueb39{{ end }} {{ .UserName }} "
                 },
                 {
                     "type": "path",

scripts/Arch/OS/setup.fish

@@ -107,7 +107,7 @@ begin
         set -l file "/etc/systemd/system/getty@tty1.service.d/autologin.conf"
         arch-chroot "$mountDir" mkdir -p (dirname "$file")
 
-        begin
+        and begin
             printf %s\n \
                 "[Service]" \
                 "ExecStart=" \

scripts/Arch/Software/GRUB/main.fish

@@ -3,7 +3,7 @@ begin
     set -l dir (status dirname)
     source "$dir/../../Scripts/software.fish"
 
-    function installSW
+    function installSW -V dir
         pacinst \
             grub \
             efibootmgr \

scripts/Common/OS/setup.fish

@@ -8,6 +8,7 @@ function runSetup
     set -l projectName (basename "$projectRoot")
     set -l PROJECT_CLONE_ROOT "/opt/$(basename "$projectName")"
     set -l script (mktemp)
+    chmod +x "$script"
 
     if not type -q runChroot
         function runChroot -S
@@ -31,20 +32,20 @@ function runSetup
     function runInOS -S
         set -l script "/root/run_once"
         wrapScript $argv | chroot "$mountDir" tee "$script" > /dev/null
-        runChroot "$mountDir" chmod +x "$script"
-        runChroot "$mountDir" "$script"
-        runChroot "$mountDir" rm "$script"
+        and runChroot "$mountDir" chmod +x "$script"
+        and runChroot "$mountDir" "$script"
+        and runChroot "$mountDir" rm "$script"
     end
 
     function wrapScript -S
         printf %s\n \
             "cd $PROJECT_CLONE_ROOT" \
-            "export CONFIG_NAME=$(string escape (getCloneFile "$CONFIG_NAME"))" \
             "$argv"
     end
 
     getConfig valhalla.partition.script > "$script"
-    bash "$script"
+    and "$script"
+    and rm "$script"
 
     # Copy `nixpkgs` channel
     and begin

scripts/Common/Scripts/Config.ps1

@@ -346,8 +346,13 @@ $null = New-Module {
             $Value
         )
 
-        $key = Get-SetupConfigKey;
-        $null = Set-ItemProperty ($key.PSPath) -Name $Name -Value $Value;
+        $key = (Get-SetupConfigKey).PSPath;
+
+        if ($null -eq $Value) {
+            Remove-ItemProperty $key -Name $Name;
+        } else {
+            $null = Set-ItemProperty $key -Name $Name -Value $Value;
+        }
     }
 
     <#

scripts/Common/Scripts/Operations.ps1

@@ -77,6 +77,7 @@ $null = New-Module {
             }
 
             $Global:InOperation = $true;
+            $Global:NonInteractive = $NonInteractive;
             $Global:ErrorActionPreference = $NonInteractive.IsPresent ? 'Continue' : 'Inquire';
 
             if ($IsWindows) {

scripts/Common/Scripts/eval-flake.fish

@@ -18,10 +18,9 @@ function evalFlake --argument-names config property
         set _flag_apply "_: ($_flag_apply) ((import $(status dirname)/../../../lib/eval-attribute.nix) _)"
     end
 
-    ROOT="$(realpath (status dirname))/../../.." \
     PROPERTY="$property" \
     nix eval --impure --extra-experimental-features "nix-command flakes" \
         --apply "$_flag_apply" \
-        "$(status dirname)/../../..#valhalla$config" \
+        "$(realpath (status dirname))/../../..#valhalla$config" \
         $argv
 end

scripts/Windows/OS/Manage.ps1

@@ -133,6 +133,8 @@ $null = New-Module {
                                         Write-Host "Entering install phase";
                                         Deploy-SoftwareAction;
                                         Set-SetupStage ([SetupStage]::CreateUser);
+                                        Restart-Intermediate;
+                                        return;
                                     }
                                     ([SetupStage]::CreateUser) {
                                         Install-ValhallaUsers;

scripts/Windows/Scripts/PowerManagement.ps1

@@ -185,6 +185,10 @@ $null = New-Module {
             }
         }
 
+        if ($env:DEBUG -and (-not $Global:NonInteractive)) {
+            Read-Host "Press enter to reboot";
+        }
+
         Restart-Computer -Force;
     }
 }

scripts/Windows/Scripts/Users.ps1

@@ -98,9 +98,12 @@ $null = New-Module {
                         Unregister-WslDistribution;
                         Set-UserStage ([UserStage]::Completed);
                         Restart-Intermediate;
+                        exit;
                     }
                 }
             }
+
+            Set-UserStage $null;
         }
 
         foreach ($user in $users) {