Add code for cleaning up after installations

lib/modules/users.nix

@@ -78,9 +78,7 @@
                     description = "Blablabla";
                     default = (lib.attrsets.concatMapAttrs (
                       name: options: {
-                          ${capitalize name} = options // {
-                            groups = [];
-                          };
+                          ${capitalize name} = options;
                         }) config.users);
                   };
                 };

profiles/Generic/config.nix

@@ -40,17 +40,17 @@
           manuel = {
             displayName = "Manuel Thalmann";
             mailAddress = "m@nuth.ch";
-
-            groups = [
-              "wheel"
-              "nix-users"
-            ];
           };
         };
 
         linux.users.manuel = {
             defaultShell = "fish";
 
+            groups = [
+              "wheel"
+              "nix-users"
+            ];
+
             rclone = {
               configurations = {
                 nextcloud = {

scripts/Common/Scripts/Config.ps1

@@ -5,6 +5,7 @@ using namespace System.Security.Principal;
 enum WindowsInstallerStage {
     Initialize
     Run
+    Cleanup
     Completed
 }
 

scripts/Common/Scripts/Operations.ps1

@@ -27,6 +27,33 @@ $null = New-Module {
         Set-SetupOption $taskOption ([string]$Task);
     };
 
+    <#
+        .SYNOPSIS
+        Gets the PowerShell modules required for operating.
+    #>
+    function Get-RequiredModules {
+        $modules = @(
+            @("PSScriptAnalyzer")
+        ) + (& {
+            if (-not $IsWindows) {
+                @()
+            } else {
+                @(
+                    @("KnownFolders"),
+                    @("PSWindowsUpdate"),
+                    @("LocalAccounts", $true),
+                    @("NuGet")
+                )
+            }
+        });
+
+        for ($i = 0; $i -lt $modules.Count; $i++) {
+            if ($modules[$i] -is [string]) {
+                $modules[$i] = @($modules[$i]);
+            }
+        }
+    }
+
     function Start-Operation {
         param(
             [switch] $NonInteractive,
@@ -57,10 +84,6 @@ $null = New-Module {
                     $env:CONFIG_MODULE = Resolve-Path $env:CONFIG_MODULE;
                 }
 
-                if (Test-Admin) {
-                    Disable-WindowsUpdateAutoRestart;
-                }
-
                 New-Alias -Force "sudo" gsudo;
             }
 
@@ -219,22 +242,7 @@ $null = New-Module {
                     }
 
                     Invoke-Hook "Install-PSModules" -Fallback {
-                        $modules = @(
-                            @("PSScriptAnalyzer")
-                        ) + (& {
-                            if (-not $IsWindows) {
-                                @()
-                            } else {
-                                @(
-                                    @("KnownFolders"),
-                                    @("PSWindowsUpdate"),
-                                    @("LocalAccounts", $true),
-                                    @("NuGet")
-                                )
-                            }
-                        });
-
-                        foreach ($module in $modules) {
+                        foreach ($module in (Get-RequiredModules)) {
                             $parameters = @{ };
 
                             if ($module -is [string]) {
@@ -407,6 +415,13 @@ $null = New-Module {
     function Clear-OperationResources {
         if ($IsWindows) {
             Uninstall-WslDistribution;
+            $null = Uninstall-Package Selenium.WebDriver -ErrorAction Continue;
+            Uninstall-ChocoPackage 7zip.portable gsudo selenium-gecko-driver yq;
+            Uninstall-WingetPackage AutoHotkey.AutoHotkey;
+        }
+
+        foreach ($module in (Get-RequiredModules)) {
+            Uninstall-Module -Force -Name $module[0];
         }
     }
 };

scripts/Common/Scripts/Software.ps1

@@ -9,6 +9,64 @@ $null = New-Module {
     . "$PSScriptRoot/../Types/InstallerAction.ps1";
     $userArgument = "name";
 
+    $chocoRunner = {
+        param(
+            [string] $Action = 'install',
+            [string[]] $ArgumentList,
+            [scriptblock] $Guard = { $true },
+            [Parameter(Position = 0)]
+            [string] $Name,
+            [Parameter(ValueFromRemainingArguments = $true)]
+            [string[]] $AdditionalNames = @()
+        )
+
+        [System.Collections.ArrayList] $Names = @();
+        $null = $Names.Add($Name);
+        $Names.AddRange($AdditionalNames);
+
+        if (-not ($Force.IsPresent)) {
+            for ($i = $Names.Count - 1; $i -ge 0; $i--) {
+                $name = $Names[$i];
+
+                if (-not (& $Guard $name)) {
+                    $Names.RemoveAt($i);
+                }
+            }
+        }
+
+        if ($Names.Count -ge 1) {
+            choco $Action -y @ArgumentList @Names;
+        }
+    };
+
+    $wingetRunner = {
+        param(
+            [string] $Action = 'install',
+            [string[]] $ArgumentList,
+            [scriptblock] $Guard = { $true },
+            [Parameter(Position = 0)]
+            [string] $Name,
+            [Parameter(ValueFromRemainingArguments = $true)]
+            [string[]] $AdditionalNames = @()
+        )
+
+        [System.Collections.ArrayList] $Names = @();
+        $null = $Names.Add($Name);
+        $Names.AddRange($AdditionalNames);
+
+        foreach ($name in $Names) {
+            if ($Force.IsPresent -or (& $Guard $name $PSBoundParameters)) {
+                winget $Action `
+                    --accept-source-agreements `
+                    --source winget `
+                    $ArgumentList `
+                    --exact --id $name ;
+            } else {
+                Write-Host "Package ``$name`` is already installed"
+            }
+        }
+    };
+
     <#
         .SYNOPSIS
         Installs the specified packages using chocolatey.
@@ -26,24 +84,39 @@ $null = New-Module {
             [string[]] $AdditionalNames = @()
         )
 
-        [System.Collections.ArrayList] $Names = @();
-        $null = $Names.Add($Name);
-        $Names.AddRange($AdditionalNames);
-
-        if (-not ($Force.IsPresent)) {
-            for ($i = $Names.Count - 1; $i -ge 0; $i--) {
-                $name = $Names[$i];
-
-                if (Test-ChocoPackage $name) {
-                    Write-Host "Package ``$name`` is already installed"
-                    $Names.RemoveAt($i);
-                }
+        & $chocoRunner @PSBoundParameters -Guard {
+            param($Name)
+            if (Test-ChocoPackage $Name) {
+                Write-Host "Package ``$Name`` is already installed"
+                $false;
+            } else {
+                $true;
             }
-        }
+        };
+    }
 
-        if ($Names.Count -ge 1) {
-            choco install -y @ArgumentList @Names;
-        }
+    <#
+        .SYNOPSIS
+        Uninstalls the specified packages using chocolatey.
+    #>
+    function Uninstall-ChocoPackage {
+        param(
+            [string[]] $ArgumentList,
+            [Parameter(Position=0)]
+            [string] $Name,
+            [Parameter(ValueFromRemainingArguments = $true)]
+            [string[]] $AdditionalNames = @()
+        )
+
+        & $chocoRunner @PSBoundParameters -Action 'uninstall' -Guard {
+            param($Name)
+            if (Test-ChocoPackage $Name) {
+                $true;
+            } else {
+                Write-Host "Package ``$Name`` is not installed";
+                $false;
+            }
+        };
     }
 
     <#
@@ -63,21 +136,41 @@ $null = New-Module {
             [string[]] $AdditionalNames = @()
         )
 
-        [System.Collections.ArrayList] $Names = @();
-        $null = $Names.Add($Name);
-        $Names.AddRange($AdditionalNames);
+        & $wingetRunner @PSBoundParameters `
+            -ArgumentList @($PSBoundParameters.ArgumentList + @("--accept-package-agreements")) `
+            -Guard {
+                param($Name, $Parameters)
+                if (Test-WingetPackage @Parameters) {
+                    Write-Host "Package ``$Name`` is already installed"
+                    $false;
+                } else {
+                    $true;
+                }
+            };
+    }
 
-        foreach ($name in $Names) {
-            if ($Force.IsPresent -or -not (Test-WingetPackage @PSBoundParameters)) {
-                winget install `
-                    --accept-source-agreements --accept-package-agreements `
-                    --source winget `
-                    $ArgumentList `
-                    --exact --id $name ;
+    <#
+        .SYNOPSIS
+        Uninstalls the specified packages using `winget`.
+    #>
+    function Uninstall-WingetPackage {
+        param(
+            [string[]] $ArgumentList,
+            [Parameter(Position=0)]
+            [string] $Name,
+            [Parameter(ValueFromRemainingArguments = $true)]
+            [string[]] $AdditionalNames = @()
+        )
+
+        & $wingetRunner @PSBoundParameters -Action 'uninstall' -Guard {
+            param($Name, $Parameters)
+            if (Test-WingetPackage @Parameters) {
+                $true;
             } else {
-                Write-Host "Package ``$name`` is already installed"
+                Write-Host "Package ``$Name`` is not installed"
+                $false;
             }
-        }
+        };
     }
 
     <#

scripts/Windows/OS/Manage.ps1

@@ -20,6 +20,7 @@ $null = New-Module {
     . "$PSScriptRoot/../Types/WindowsInstallerAction.ps1";
     . "$PSScriptRoot/../../Common/Scripts/Config.ps1";
     . "$PSScriptRoot/../../Common/Scripts/Operations.ps1";
+    . "$PSScriptRoot/../../Common/Scripts/Scripting.ps1";
     . "$PSScriptRoot/../../Common/Scripts/Software.ps1";
     . "$PSScriptRoot/../../Common/Scripts/SoftwareManagement.ps1";
     . "$PSScriptRoot/../../Common/Types/InstallerAction.ps1";
@@ -119,6 +120,8 @@ $null = New-Module {
                                         Write-Host "Entering install phase";
                                         Deploy-SoftwareAction;
                                         Set-SetupStage ([SetupStage]::CreateUser);
+                                        Restart-Intermediate;
+                                        return;
                                     }
                                     ([SetupStage]::CreateUser) {
                                         Install-ValhallaUsers;
@@ -129,7 +132,36 @@ $null = New-Module {
                         }
                     }
 
+                    Set-Stage ([WindowsInstallerStage]::Cleanup);
+                    break;
+                }
+                ([WindowsInstallerStage]::Cleanup) {
+                    $taskName = "PortValhalla Cleaner";
+                    $setupUser = Get-SetupUser;
+                    Clear-OperationResources;
+                    Remove-Item -Recurse -Force "C:\ProgramData\PortValhalla";
+                    Get-SetupConfigKey | Remove-Item -Recurse -Force;
+                    Disable-Autologin;
+                    Disable-LocalUser $setupUser;
+
+                    $script = {
+                        param(
+                            $TaskName,
+                            $UserName
+                        )
+
+                        $user = Get-LocalUser $UserName;
+                        [string] $sid = $user.SID;
+                        Remove-LocalUser $user;
+                        Get-CimInstance Win32_UserProfile | Where-Object { $_.SID -eq $sid } | Remove-CimInstance;
+                        Unregister-ScheduledTask -Confirm:$false $TaskName;
+                    };
+
+                    $trigger = New-ScheduledTaskTrigger -AtStartup;
+                    $task = New-ScheduledTaskAction -Execute "pwsh" -Argument "-Command & { $script } $(ConvertTo-Injection $taskName) $(ConvertTo-Injection $setupUser)";
+                    $null = Register-ScheduledTask -Force $taskName -Action $task -Trigger $trigger -RunLevel Highest -User "SYSTEM";
                     Set-Stage ([WindowsInstallerStage]::Completed);
+                    Restart-Intermediate -NoRegister;
                     break;
                 }
             }

scripts/Windows/Scripts/Registry.ps1

@@ -56,19 +56,6 @@ $null = New-Module {
         Set-BootMessage;
     }
 
-    <#
-        .SYNOPSIS
-        Disables automatic reboots by Windows Update.
-    #>
-    function Disable-WindowsUpdateAutoRestart {
-        $path = "$wuPolicyPath\AU";
-        $null = New-Item -Force $path -ErrorAction SilentlyContinue;
-
-        Set-ItemProperty $path `
-            -Name NoAutoRebootWithLoggedOnUsers `
-            -Value 1;
-    }
-
     <#
         .SYNOPSIS
         Resets the automatic reboot state.

scripts/Windows/Scripts/Users.ps1

@@ -81,7 +81,7 @@ $null = New-Module {
                         Deploy-SoftwareAction -Action ConfigureUser;
                         Remove-LocalGroupMember -Member "$name" @adminGroup -ErrorAction SilentlyContinue;
 
-                        foreach ($group in Get-UserConfig "groups") {
+                        foreach ($group in Get-UserConfig -UserName "$name" "groups") {
                             Add-LocalGroupMember -Member "$name" -Name "$group";
                         }
 

scripts/Windows/Software/ManiaPlanet/Manage.ps1

@@ -40,7 +40,7 @@ param(
             )
 
             Expand-BackupArtifacts -User $Arguments.Name -Path "ManiaPlanet" -Target $path;
-        } | Out-Host;
+        };
 } $PSBoundParameters;
 
 # ToDo: Add restoration

scripts/Windows/Software/RetroArch/Manage.ps1

@@ -32,7 +32,5 @@ $null = New-Module {
         -Configurator {
             Add-StartMenuIcon "RetroArch" "C:\tools\RetroArch-Win64\retroarch.exe";
             Expand-BackupArtifacts -Path "RetroArch" -Target $path;
-        } | Out-Host;
+        };
 } $PSBoundParameters;
-
-# ToDo: Add restoration

scripts/Windows/Software/TrackMania Nations Forever/Manage.ps1

@@ -40,5 +40,5 @@ param(
             param([hashtable] $Arguments)
             $name = $Arguments.Name;
             Expand-BackupArtifacts -User $name -Path "TmNationsForever" -Target $path;
-        } | Out-Host;
+        };
 } $PSBoundParameters;

scripts/Windows/Software/TrackMania United Forever/Manage.ps1

@@ -49,5 +49,5 @@ param(
     -UserConfigurator {
         param([hashtable] $Arguments)
         Expand-BackupArtifacts -User $Arguments.Name -Path "TmUnitedForever" -Target $path;
-    } | Out-Host;
+    };
 } $PSBoundParameters;