Merge branch 'new-update' into new-update

Author: TheyCreeper

src/playbook/Configuration/atlas/start.yml

@@ -32,15 +32,8 @@ actions:
 
   - !writeStatus: {status: 'Enabling DirectPlay'}
   - !run: {exe: 'DISM.exe', args: '/Online /Enable-Feature /FeatureName:"DirectPlay" /NoRestart /All', weight: 30}
-
-  - !writeStatus: {status: 'Disabling Internet Explorer', builds: [ '<22000' ]}
-  - !run: {exe: 'DISM.exe', args: '/Online /Disable-Feature /FeatureName:"Internet-Explorer-Optional-amd64" /NoRestart', weight: 30, builds: [ '<22000' ]}
-
-  - !writeStatus: {status: 'Disabling Maths Recognizer', builds: [ '<22000' ]}
-  - !run: {exe: 'DISM.exe', args: '/Online /Remove-Capability /CapabilityName:"MathRecognizer~~~~0.0.1.0" /NoRestart', weight: 30, builds: [ '<22000' ]}
-
-  - !writeStatus: {status: 'Disabling Steps Recorder'}
-  - !run: {exe: 'DISM.exe', args: '/Online /Remove-Capability /CapabilityName:"App.StepsRecorder~~~~0.0.1.0" /NoRestart', weight: 30}
+  
+  - !run: {exe: 'DISM.exe', args: '/Online /Remove-Capability /CapabilityName:"App.StepsRecorder~~~~0.0.1.0" /NoRestart', weight: 30, onUpgrade: false}
 
   - !writeStatus: {status: 'Cleaning the component store'}
   - !run: {exe: 'DISM.exe', args: '/Online /Cleanup-Image /StartComponentCleanup', weight: 50}

src/playbook/Configuration/custom.yml

@@ -8,6 +8,11 @@ actions:
     oobe: false
     wait: true
   - !writeStatus: { status: "Deleting old AtlasOS folders" }
+  - !powerShell:
+    command: '.\STOPFOLDERPROC.ps1'
+    exeDir: true
+    wait: true
+    runas: currentUserElevated
   - !powerShell:
     command: |
       $windir = [Environment]::GetFolderPath('Windows')
@@ -30,7 +35,9 @@ actions:
           Copy-Item -Path $_ -Destination $windir -Force -Recurse
           if (!$?) { exit 2 }
       }
-      Start-Process -FilePath "$windir\AtlasDesktop\6. Advanced Configuration\Process Explorer\Uninstall Process Explorer.cmd" -ArgumentList "/silent"
+      if (winget list --name "Process Explorer") {
+        Start-Process -FilePath "$windir\AtlasDesktop\6. Advanced Configuration\Process Explorer\Uninstall Process Explorer.cmd" -ArgumentList "/silent"
+      }
       Copy-Item -Path 'Themes\*' -Destination """$windir\Resources\Themes""" -Force -Recurse
     weight: 10
     wait: true

src/playbook/Configuration/tweaks/misc/add-newUser-script.yml

@@ -2,17 +2,9 @@
 title: Add newUsers.cmd script
 description: Adds the newUsers.ps1 script to RunOnce, which applies any tweaks that are dynamically generated on new user creation
 actions:
-  - !powerShell:
-    command: 'reg load HKU\AME_UserHive_Default C:\Users\Default\NTUSER.DAT'
-    oobe: false
-    wait: true
   - !registryValue:
     path: 'HKU\AME_UserHive_Default\SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce'
     value: 'RunScript'
     data: |
-      powershell -EP Bypass -NoP & """$([Environment]::GetFolderPath('Windows'))\AtlasModules\Scripts\newUsers.cmd"""
-    type: REG_SZ
-  - !powerShell:
-    command: "reg unload \"HKU\\AME_UserHive_Default\""
-    oobe: false
-    wait: true
+      powershell -EP Bypass -NoP & """$([Environment]::GetFolderPath('Windows'))\AtlasModules\Scripts\newUsers.ps1"""
+    type: REG_SZ

src/playbook/Configuration/tweaks/networking/atlas-network-settings.yml

@@ -3,7 +3,7 @@ title: Applies Atlas' Network Settings
 description: Applies Atlas' optimised network settings
 actions:
   - !cmd:
-    command: '"AtlasDesktop\8. Troubleshooting\Network\Reset Network to Atlas Default.cmd" /silent'
+    command: '"AtlasDesktop\9. Troubleshooting\Network\Reset Network to Atlas Default.cmd" /silent'
     exeDir: true
     wait: true
     runas: currentUserElevated

src/playbook/Configuration/tweaks/performance/disable-sysfetch.yml

@@ -9,14 +9,14 @@ actions:
       Set-ThemeMRU
     wait: true
     onUpgrade: true
-    oobe: false
+    oobe: true
     exeDir: true
     runas: currentUserElevated
 
   - !powerShell:
     command: |
       .\AtlasModules\initPowerShell.ps1
-      Set-Theme -Path """$([Environment]::GetFolderPath('Windows'))\Resources\Themes\atlas-v0.4.x-dark.theme"""
+      Set-Theme -Path """$([Environment]::GetFolderPath('Windows'))\Resources\Themes\atlas-v0.5.x-dark.theme"""
       Set-ThemeMRU
     wait: true
     onUpgrade: false
@@ -56,9 +56,9 @@ actions:
 
     # Set Atlas theme as default for new users
   - !registryValue:
-    path: 'HKCU\Software\Policies\Microsoft\Windows\Personalization'
+    path: 'HKU\AME_UserHive_Default\Software\Policies\Microsoft\Windows\Personalization'
     value: 'ThemeFile'
-    data: '%windir%\Resources\Themes\atlas-v0.4.x-dark.theme'
+    data: '%windir%\Resources\Themes\atlas-v0.5.x-dark.theme'
     type: REG_SZ
     onUpgrade: true
 

src/playbook/Configuration/tweaks/qol/appearance/atlas-theme.yml

@@ -1,83 +0,0 @@
-$windir = [Environment]::GetFolderPath('Windows')
-
-function Stop-ThemeProcesses {
-    Get-Process 'SystemSettings', 'control' -EA 0 | Stop-Process -Force -EA 0
-}
-
-function Set-Theme {
-    param (
-        [Parameter(Mandatory = $true)]
-        [ValidateNotNullOrEmpty()]
-        [string]$Path
-    )
-
-    if (!((Get-Item $Path -EA 0).Extension -eq '.theme')) {
-        throw "'$Path' is not a valid path to a theme file."
-    }
-    Stop-ThemeProcesses
-    Start-Process -filepath $path ; timeout /t 3; taskkill /im "systemsettings.exe" /f   
-    Start-Sleep 10
-    Stop-ThemeProcesses
-}
-
-function Set-ThemeMRU {
-    if ([System.Environment]::OSVersion.Version.Build -ge 22000) {
-        Stop-ThemeProcesses
-        Set-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Themes" -Name "ThemeMRU" -Value "$((@(
-            "atlas-v0.4.x-dark.theme",
-            "atlas-v0.4.x-light.theme",
-            "atlas-v0.3.x-dark.theme",
-            "atlas-v0.3.x-light.theme",
-            "dark.theme",
-            "aero.theme"
-        ) | ForEach-Object { "$windir\resources\Themes\$_" }) -join ';');" -Type String -Force
-    }
-}
-
-# Credit: https://superuser.com/a/1343640
-function Set-LockscreenImage {
-    param (
-        [ValidateNotNullOrEmpty()]
-        [string]$Path = "$([Environment]::GetFolderPath('Windows'))\AtlasModules\Wallpapers\lockscreen.png"
-    )
-
-    if (!(Test-Path $Path)) {
-        throw "Path ('$Path') for lockscreen not found."
-    }
-    $newImagePath = [System.IO.Path]::GetTempPath() + (New-Guid).Guid + [System.IO.Path]::GetExtension($Path)
-    Copy-Item $Path $newImagePath
-
-    # setup WinRT namespaces
-    Add-Type -AssemblyName System.Runtime.WindowsRuntime
-    [Windows.System.UserProfile.LockScreen, Windows.System.UserProfile, ContentType = WindowsRuntime] | Out-Null
-
-    # setup async
-    $asTaskGeneric = ([System.WindowsRuntimeSystemExtensions].GetMethods() | ? {
-        $_.Name -eq 'AsTask' -and
-        $_.GetParameters().Count -eq 1 -and
-        $_.GetParameters()[0].ParameterType.Name -eq 'IAsyncOperation`1'
-    })[0]
-    Function Await($WinRtTask, $ResultType) {
-        $asTask = $asTaskGeneric.MakeGenericMethod($ResultType)
-        $netTask = $asTask.Invoke($null, @($WinRtTask))
-        $netTask.Wait(-1) | Out-Null
-        $netTask.Result
-    }
-    Function AwaitAction($WinRtAction) {
-        $asTask = ([System.WindowsRuntimeSystemExtensions].GetMethods() | ? { $_.Name -eq 'AsTask' -and $_.GetParameters().Count -eq 1 -and !$_.IsGenericMethod })[0]
-        $netTask = $asTask.Invoke($null, @($WinRtAction))
-        $netTask.Wait(-1) | Out-Null
-    }
-
-    # make image object
-    [Windows.Storage.StorageFile, Windows.Storage, ContentType = WindowsRuntime] | Out-Null
-    $image = Await ([Windows.Storage.StorageFile]::GetFileFromPathAsync($newImagePath)) ([Windows.Storage.StorageFile])
-    
-    # execute
-    AwaitAction ([Windows.System.UserProfile.LockScreen]::SetImageFileAsync($image))
-    
-    # cleanup
-    Remove-Item $newImagePath
-}
-
-Export-ModuleMember -Function Set-Theme, Set-ThemeMRU, Set-LockscreenImage

src/playbook/Executables/AtlasDesktop/6. Advanced Configuration/Services/Superfetch/Disable SuperFetch (default).cmd renamed to src/playbook/Executables/AtlasDesktop/6. Advanced Configuration/Services/Superfetch/Disable SuperFetch.cmd

@@ -1,6 +1,6 @@
 function Write-Title {
     param (
-        [Parameter(Mandatory=$true)]
+        [Parameter(Mandatory = $true)]
         [string]$Text
     )
 
@@ -35,9 +35,9 @@ enum MsgButtons {
 }
 function Read-MessageBox {
     param (
-        [Parameter(Mandatory=$true)]
+        [Parameter(Mandatory = $true)]
         [string]$Title,
-        [Parameter(Mandatory=$true)]
+        [Parameter(Mandatory = $true)]
         [string]$Body,
         [MsgIcon]$Icon = 'Info',
         [MsgButtons]$Buttons = 'YesNo',
@@ -50,7 +50,7 @@ function Read-MessageBox {
     $value += [MsgButtons].GetEnumValues().IndexOf([MsgButtons]"$Buttons") # buttons
     if (!$NoTopmost) { $value += 4096 } # topmost
 
-    $result = (New-Object -ComObject "Wscript.Shell").Popup($Body,$Timeout,$Title,$value)
+    $result = (New-Object -ComObject "Wscript.Shell").Popup($Body, $Timeout, $Title, $value)
     $results = @{
         1 = 'Ok'
         2 = 'Cancel'
@@ -63,9 +63,105 @@ function Read-MessageBox {
 
     if ($result) {
         return $results.$result
-    } else {
+    }
+    else {
         return 'None'
     }
 }
 
-Export-ModuleMember -Function Write-Title, Read-Pause, Read-MessageBox
+function Stop-ProcessesUnderRoots {
+    param([string[]]$RootsLower)
+
+    foreach ($proc in Get-Process -ErrorAction SilentlyContinue) {
+        if (-not $proc.Path) { continue }
+
+        $procPath = try {
+            ([System.IO.Path]::GetFullPath($proc.Path)).ToLowerInvariant()
+        }
+        catch {
+            continue
+        }
+
+        foreach ($root in $RootsLower) {
+            if ($procPath.StartsWith($root)) {
+                try {
+                    Stop-Process -Id $proc.Id -Force -ErrorAction Stop
+                    Wait-Process -Id $proc.Id -ErrorAction SilentlyContinue -Timeout 5
+                }
+                catch {
+                    continue
+                }
+
+                break
+            }
+        }
+    }
+}
+
+function Stop-TasksUnderRoots {
+    param([string[]]$RootsLower)
+
+    try {
+        Import-Module ScheduledTasks -ErrorAction SilentlyContinue | Out-Null
+    }
+    catch {
+        # Module may not be available on older systems; continue with fallbacks.
+    }
+
+    $tasks = @()
+    try {
+        $tasks = Get-ScheduledTask -ErrorAction Stop
+    }
+    catch {
+        $tasks = @()
+    }
+
+    foreach ($task in $tasks) {
+        $matchesRoot = $false
+
+        foreach ($action in $task.Actions) {
+            $execute = $null
+            if ($action.PSObject.Properties.Match('Execute').Count) {
+                $execute = $action.Execute
+            }
+            elseif ($action.PSObject.Properties.Match('Path').Count) {
+                $execute = $action.Path
+            }
+
+            if (-not $execute) { continue }
+
+            $executeLower = try {
+                ([System.IO.Path]::GetFullPath($execute)).ToLowerInvariant()
+            }
+            catch {
+                $null
+            }
+
+            if (-not $executeLower) { continue }
+
+            foreach ($root in $RootsLower) {
+                if ($executeLower.StartsWith($root)) {
+                    $matchesRoot = $true
+                    break
+                }
+            }
+
+            if ($matchesRoot) { break }
+        }
+
+        if (-not $matchesRoot) { continue }
+
+        try {
+            Stop-ScheduledTask -TaskName $task.TaskName -TaskPath $task.TaskPath -ErrorAction SilentlyContinue
+        }
+        catch {
+            # Ignore and fall back to schtasks below.
+        }
+    }
+
+    foreach ($candidate in @('Force Timer Resolution', '\Force Timer Resolution')) {
+        & schtasks.exe /End /TN $candidate 1>$null 2>$null
+    }
+}
+
+Export-ModuleMember -Function Write-Title, Read-Pause, Read-MessageBox, Stop-ProcessesUnderRoots, Stop-TasksUnderRoots