Create a separate script for WSL interaction

lib/modules/os.nix

@@ -10,7 +10,21 @@
         type = types.submodule (
           { extendModules, ... }:
             let
-              osVariant = extendModules { };
+              osVariant = extendModules {
+                modules = [
+                  ({ config, ... }: {
+                    options = {
+                      config = mkOption {
+                        type = types.attrs;
+                        description = "The configuration of the Operating System.";
+                        default = builtins.removeAttrs config ["_module" "config" "linux" "windows"];
+                        visible = false;
+                      };
+                    };
+                  })
+                ];
+              };
+
               linuxVariant = osVariant.extendModules { };
               windowsVariant = osVariant.extendModules { };
             in {

lib/modules/windows.nix

@@ -1,9 +1,10 @@
 { lib, config, ... }:
   let
     inherit (lib)
-      mkOption
+      mkDefault
       mkEnableOption
       mkIf
+      mkOption
       types
     ;
 
@@ -39,8 +40,8 @@
 
     config = {
       valhalla.windows = {
-        setupUser.name = capitalize config.valhalla.setupUser.name;
-        dualboot.linuxPercentage = mkIf (!config.valhalla.windows.dualboot.enable) 0;
+        setupUser.name = mkDefault (capitalize config.valhalla.setupUser.name);
+        dualboot.linuxPercentage = mkIf (!config.valhalla.windows.dualboot.enable) (mkDefault 0);
       };
     };
   }

profiles/manuel/config.nix

@@ -1,8 +1,22 @@
 { ... }: {
-  valhalla.users.manuel = {
-    oh-my-posh = {
-      theme = {
-        source = ./manuel.omp.json;
+  imports = [
+    ../../lib/modules/valhalla.nix
+  ];
+
+  config = {
+    valhalla = {
+      users.manuel = {
+        oh-my-posh = {
+          theme = {
+            source = ./manuel.omp.json;
+          };
+        };
+      };
+
+      partition = {
+        os = {
+          partitions = { };
+        };
       };
     };
   };

profiles/manuel/manuel.omp.json

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

scripts/Common/Scripts/Config.ps1

@@ -14,6 +14,7 @@ enum SetupStage {
 enum UserStage {
     Create
     Configure
+    Cleanup
     Completed
 }
 
@@ -228,7 +229,7 @@ $null = New-Module {
     function Get-SetupUser {
         [OutputType([string])]
         param()
-        Get-Config "$(Get-ConfigRootName).setupUser";
+        Get-Config "$(Get-ConfigRootName).setupUser.name";
     }
 
     <#

scripts/Common/Scripts/Operations.ps1

@@ -3,6 +3,7 @@
 . "$PSScriptRoot/../../Windows/Scripts/PowerManagement.ps1";
 . "$PSScriptRoot/../../Windows/Scripts/Registry.ps1";
 . "$PSScriptRoot/../../Windows/Scripts/Security.ps1";
+. "$PSScriptRoot/../../Windows/Scripts/WSL.ps1";
 
 $null = New-Module {
     . "$PSScriptRoot/../Types/OneShotTask.ps1";
@@ -25,9 +26,12 @@ $null = New-Module {
     function Start-Operation {
         param(
             [switch] $NonInteractive,
+            [switch] $NoImplicitCleanup,
             [scriptblock] $Action
         )
 
+        $cleanup = { };
+
         if (-not $Global:InOperation) {
             if ($env:DEBUG) {
                 Set-PSDebug -Trace 1;
@@ -35,20 +39,30 @@ $null = New-Module {
 
             $Global:InOperation = $true;
             $Global:ErrorActionPreference = $NonInteractive.IsPresent ? 'Continue' : 'Inquire';
-            $env:WSLENV = "CONFIG_MODULE/p";
 
-            if ($env:CONFIG_MODULE) {
-                $env:CONFIG_MODULE = Resolve-Path $env:CONFIG_MODULE;
+            if ($IsWindows) {
+                $env:WSLENV = "CONFIG_MODULE/p";
+
+                if ($env:CONFIG_MODULE) {
+                    $env:CONFIG_MODULE = Resolve-Path $env:CONFIG_MODULE;
+                }
+
+                if (Test-Admin) {
+                    Disable-WindowsUpdateAutoRestart;
+                }
+
+                New-Alias -Force "sudo" gsudo;
             }
 
-            if (Test-Admin) {
-                Disable-WindowsUpdateAutoRestart;
+            if (-not $NoImplicitCleanup.IsPresent) {
+                $cleanup = {
+                    Clear-OperationResources;
+                };
             }
-
-            New-Alias -Force "sudo" gsudo;
         }
 
         & $Action;
+        & $cleanup;
     }
 
     <#
@@ -174,4 +188,12 @@ $null = New-Module {
             Write-EventLog -LogName $logName -Source $logName -EventId $oneShotTrigger -Message "The OneShot task ``$(Get-OneShotTask)`` finished.";
         }
     }
+
+    <#
+        .SYNOPSIS
+        Clears resources allocated during the operation.
+    #>
+    function Clear-OperationResources {
+        wsl --unregister (Get-DistributionName);
+    }
 };

scripts/Common/Software/Oh My Posh/Manage.ps1

@@ -34,7 +34,16 @@ Start-SoftwareInstaller @PSBoundParameters `
                 $root = "$($IsWindows ? $env:AppData : "~/.config")/oh-my-posh";
                 $path = Join-Path $root "$($theme.name).omp.json";
                 $null = New-Item -Force -ItemType Directory $root;
-                Set-Content $path (wsl cat $theme.source);
+
+                Set-Content $path (
+                    & {
+                        if ($IsWindows) {
+                            wsl cat $theme.source
+                        } else {
+                            cat $theme.source
+                        }
+                    });
+
                 $theme = [string] $path;
             }
     

scripts/Windows/OS/Install.ps1

@@ -3,6 +3,7 @@ using namespace System.Management.Automation.Host;
 using namespace System.Security.Principal;
 
 . "$PSScriptRoot/../../../scripts/Windows/Scripts/Prerequisites.ps1";
+. "$PSScriptRoot/../../../scripts/Windows/Scripts/WSL.ps1";
 . "$PSScriptRoot/../../Common/Scripts/Context.ps1";
 . "$PSScriptRoot/../Scripts/Security.ps1";
 . "$PSScriptRoot/../Software/Firefox/Install.ps1";
@@ -27,7 +28,7 @@ $null = New-Module {
         Finishes the installation of a running Windows machine.
     #>
     function Start-WindowsInstallation {
-        Start-Operation {
+        Start-Operation -NoImplicitCleanup {
             Start-InstallationLoop;
         };
     }
@@ -37,7 +38,9 @@ $null = New-Module {
         Starts the installation loop.
     #>
     function Start-InstallationLoop {
-        $wslLocation = "$env:ProgramData\PortValhalla\Ubuntu";
+        $distribution = Get-DistributionName;
+        $wslLocation = Get-DistributionPath;
+        $wslDisk = Get-DistributionDisk;
 
         while (-not (Get-IsFinished)) {
             switch (Get-Stage) {
@@ -131,7 +134,7 @@ $null = New-Module {
                                 gsudo -d -s copy $cmd $osk;
                                 continue;
                             }
-                        }
+                        };
                     }
 
                     if (-not (Test-Winget)) {
@@ -161,6 +164,7 @@ $null = New-Module {
                         Copy-Item -Recurse (Get-AppxPackage "*Ubuntu*").InstallLocation $wslLocation;
                         Set-UserPermissions $wslLocation;
                         & "$wslLocation\ubuntu.exe" install --root;
+                        wsl --shutdown;
                         continue;
                     }
 
@@ -195,8 +199,8 @@ $null = New-Module {
                 }
                 default {
                     if (-not (& { $null = wsl -l; $? })) {
-                        wsl --import-in-place "PortValhalla" "$wslLocation/ext4.vhdx";
-                        wsl --set-default "PortValhalla";
+                        wsl --import-in-place $distribution "$wslDisk";
+                        wsl --set-default $distribution;
                     }
 
                     switch ($_) {
@@ -318,7 +322,7 @@ $null = New-Module {
 
                                     if (Test-Collection "essential") {
                                         # Essentials
-                                        & "$softwarePath/aliae/Manage.ps1" @arguments;
+                                        & "$softwarePath/aliae/Main.ps1" @arguments;
                                         & "$softwarePath/OpenSSH/Manage.ps1" @arguments;
                                         & "$softwarePath/PowerShell/Manage.ps1" @arguments;
                                         & "$softwarePath/chocolatey/Manage.ps1" @arguments;
@@ -328,7 +332,7 @@ $null = New-Module {
                                         & "$softwarePath/Oh My Posh/Manage.ps1" @arguments;
 
                                         if (Get-Config "valhalla.windows.dualboot") {
-                                            & "$softwarePath/Ext4Fsd/Manage.ps1" @arguments;
+                                            & "$softwarePath/Ext4Fsd/Main.ps1" @arguments;
                                         }
 
                                         if ($install) {
@@ -610,7 +614,18 @@ $null = New-Module {
                                                         Add-LocalGroupMember -Member "$name" -Name "$group";
                                                     }
 
+                                                    Set-UserStage ([UserStage]::Cleanup);
+                                                }
+                                                ([UserStage]::Cleanup) {
+                                                    $user = Get-SetupUser;
+                                                    Enable-LocalUser $user;
+                                                    Set-AutologinUser $user;
+                                                    wsl --shutdown;
+                                                    $tempDisk = Rename-Item $wslDisk "ext4_.vhdx" -PassThru;
+                                                    wsl --unregister $distribution;
+                                                    Move-Item $tempDisk $wslDisk;
                                                     Set-UserStage ([UserStage]::Completed);
+                                                    Restart-Intermediate;
                                                 }
                                             }
                                         }

scripts/Windows/OS/Setup.ps1

@@ -224,7 +224,7 @@ function Start-Setup {
     foreach ($xpath in @("./ua:AutoLogon/ua:Username",
                          "./ua:UserAccounts/ua:LocalAccounts/ua:LocalAccount/ua:Name",
                          "./ua:UserAccounts/ua:LocalAccounts/ua:LocalAccount/ua:DisplayName")) {
-        $oobeSettings.SelectSingleNode($xpath, $namespace).InnerText = $valhallaConfig.setupUser;
+        $oobeSettings.SelectSingleNode($xpath, $namespace).InnerText = $valhallaConfig.setupUser.name;
     }
 
     Add-StartupCommand `

scripts/Windows/Scripts/PowerManagement.ps1

@@ -23,7 +23,7 @@ $null = New-Module {
             [RegistryKey] $UserKey
         )
 
-        [string] $path;
+        [string] $path = $null;
 
         if ($UserKey) {
             $path = Join-Path ($UserKey.PSPath) $runOncePath;
@@ -55,7 +55,7 @@ $null = New-Module {
         ($env:DEBUG ? "`$env:DEBUG = $([int]$env:DEBUG);" : "")
         "`$env:INSTALLER_SCRIPT = $(ConvertTo-Injection (Resolve-Path $env:INSTALLER_SCRIPT));" +
         "`$env:CONFIG_MODULE = $(ConvertTo-Injection (Resolve-Path $env:CONFIG_MODULE));" +
-        "& `$env:INSTALLER_SCRIPT;"
+        "& `$env:INSTALLER_SCRIPT;";
     }
 
     <#
@@ -86,7 +86,11 @@ $null = New-Module {
 
                 Register-Setup -UserKey $Key;
             }
-        } elseif ($User.IsPresent -or $UserKey) {
+
+            return;
+        }
+
+        if ($User.IsPresent -or $UserKey) {
             if (-not $UserKey) {
                 $UserKey = Get-Item "HKCU:\";
             }

scripts/Windows/Scripts/Update.ps1

@@ -22,11 +22,11 @@ function Update-WindowsInstallation {
             catch { }
     
             if ((Get-WURebootStatus -Silent)) {
-                Write-Information "A Reboot is Required!";
-                Write-Information "Windows will reboot now and the installation will be continued automatically.";
+                Write-Host "A Reboot is Required!";
+                Write-Host "Windows will reboot now and the installation will be continued automatically.";
                 return;
             } else {
-                Write-Information "Updating Windows finished successfully!";
+                Write-Host "Updating Windows finished successfully!";
                 return;
             }
         }

scripts/Windows/Scripts/Users.ps1

@@ -105,7 +105,7 @@ $null = New-Module {
         if ($msAccount) {
             Add-MicrosoftAccount $Name;
             Set-SetupOption $loggedInUserOption $env:UserName;
-            Invoke-OneShot ([OneShotTask]::InitializeMSAccount)
+            Invoke-OneShot ([OneShotTask]::InitializeMSAccount);
         } else {
             New-LocalUser -NoPassword @userArguments;
             Initialize-UserCreation;
@@ -121,8 +121,7 @@ $null = New-Module {
         $msAccount = Get-UserConfig -UserName $name "microsoftAccount";
         $displayName = Get-UserConfig -UserName $Name "displayName";
 
-        Write-Host "Initializing user $name";
-        Write-Host "MS Account: $msAccount"
+        Write-Host "Initializing user ``$name``…";
 
         $userArguments = @{
             name = $name;
@@ -137,8 +136,9 @@ $null = New-Module {
         }
 
         if ($msAccount) {
-            Write-Host "Renaming $(Get-MSAccountName) to $name"
-            Rename-LocalUser (Get-MSAccountName) $name;
+            $accountName = Get-MSAccountName;
+            Write-Host "Renaming ``$accountName`` to ``$name``…"
+            Rename-LocalUser $accountName $name;
         }
 
         Set-LocalUser @userArguments;
@@ -157,7 +157,6 @@ $null = New-Module {
         if ($msAccount) {
             Disable-Autologin;
             Set-BootMessage -Caption "Please Log In" -Message "Please log in using your new Microsoft Account ``$name``.";
-            Write-Host "MS Account successfully initialized";
         } else {
             Set-AutologinUser "$name";
         }

scripts/Windows/Scripts/WSL.ps1

@@ -0,0 +1,25 @@
+$null = New-Module {
+    <#
+        .SYNOPSIS
+        Gets the name of the WSL distribution used for managing the configuration.
+    #>
+    function Get-DistributionName {
+        return "ValhallaUbuntu";
+    }
+
+    <#
+        .SYNOPSIS
+        Gets the path to the directory containing the WSL distribution.
+    #>
+    function Get-DistributionPath {
+        return "$env:ProgramData/PortValhalla/$distribution";
+    }
+
+    <#
+        .SYNOPSIS
+        Gets the path to the virtual hard disk of the WSL distribution.
+    #>
+    function Get-DistributionDisk {
+        return "$(Get-DistributionPath)/ext4.vhdx";
+    }
+};

scripts/Windows/Software/osu!lazer/Manage.ps1

@@ -8,23 +8,7 @@ param(
 
 Start-SoftwareInstaller @PSBoundParameters `
     -Installer {
-        $file = "osu!lazer.exe";
-        $processName = "osu!";
-        $dir = New-TemporaryDirectory;
-
-        Push-Location $dir;
-        Invoke-WebRequest "https://github.com/ppy/osu/releases/latest/download/install.exe" -OutFile $file;
-        Start-Process -FilePath $file;
-
-        while (-not (Get-Process -ErrorAction SilentlyContinue $processName)) {
-            Start-Sleep 1;
-        }
-
-        Start-Sleep 10;
-        Get-Process $processName | Stop-Process -Force;
-        Pop-Location;
-        Remove-Item -Recurse $dir;
-
+        Install-WingetPackage "ppy.osu";
         Remove-DesktopIcon "*osu*";
     };
 

winiso/deploy.fish

@@ -202,7 +202,7 @@ begin
 
             find "$projectPath/profiles" -type f -name "*.nix" | while read -l file
                 set -l CONFIG_MODULE "$file"
-                getConfig "valhalla.windows" --json > "$file.json"
+                getConfig "valhalla.windows.config" --json > "$file.json"
             end
         end