Skip to content

Commit 7ce873d

Browse files
committed
Refactor structure, update FeaturePages; add Advanced Mode & QoL options; prep for AtmosphereTool, more bug fixes for stability.
1 parent 4087480 commit 7ce873d

241 files changed

Lines changed: 2431 additions & 832 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Configuration/Main/appx.yml

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ actions:
3131
- !taskKill: {name: 'ms-teams*', ignoreErrors: true}
3232
- !appx: {name: 'MSTeams*', type: family}
3333
# 24H2 Copilot app
34-
- !appx: {name: 'Microsoft.Copilot*', type: family}
34+
- !appx: {name: 'Microsoft.Copilot*', type: family, option: 'remove-copilot'}
3535

3636
# Other apps
3737
- !appx: {name: 'Clipchamp.Clipchamp*', type: family}
@@ -76,32 +76,17 @@ actions:
7676
- !appx: {name: 'Microsoft.BioEnrollment*', type: family} # Windows Hello
7777
- !appx: {name: 'Microsoft.Ink.Handwriting*', type: family}
7878
- !appx: {name: 'Microsoft.Wallet*', type: family}
79-
- !appx: {name: '*Xbox.TCUI*', type: family, option: 'uninstall-xbox'}
79+
- !appx: {name: 'Microsoft.Xbox', type: family}
8080
- !appx: {name: '*XboxApp*', type: family, option: 'uninstall-xbox'}
8181
- !appx: {name: '*XboxGameCallableUI*', type: family, option: 'uninstall-xbox'}
82-
- !appx: {name: '*XboxGameOverlay*', type: family, option: 'uninstall-xbox'}
83-
- !appx: {name: '*XboxGamingOverlay*', type: family, option: 'uninstall-xbox'}
84-
- !appx: {name: '*XboxIdentity*', type: family, option: 'uninstall-xbox'}
85-
- !appx: {name: '*XboxSpeechToTextOverlay*', type: family, option: 'uninstall-xbox'}
8682
- !appx: {name: '*GamingApp*', type: family, option: 'uninstall-xbox'}
87-
# - !appx: {name: '*StartMenuExperienceHost*', type: family, option: 'openshell'} keep this incase smth goes wrong
88-
# - !appx: {name: '*WindowsStore*', type: family} blame axol
89-
# - !appx: {name: '*StorePurchaseApp*', type: family}
83+
- !appx: {name: '*WindowsStore*', type: family, option: 'remove-store'}
84+
- !appx: {name: '*StorePurchaseApp*', type: family, option: 'remove-store'}
9085
- !appx: {name: '*SecureAssessmentBrowser*', type: family}
9186
- !appx: {name: '*AssignedAccessLockApp*', type: family}
92-
- !appx: {name: '*OOBENetwork*', type: family}
93-
- !appx: {name: '*Apprep.Chx*', type: family}
94-
# Making sure Xbox Game Bar is removed
95-
- !cmd
96-
command: 'takeown /f "C:\Program Files\WindowsApps" /r /d y'
97-
runas: currentUserElevated
98-
exeDir: true
99-
wait: true
100-
- !run: {exeDir: true, exe: "RemoveXbox.cmd", runas: currentUserElevated, wait: true, option: 'uninstall-xbox'}
10187

102-
10388
# Run edge removal script
104-
- !task: {path: 'Tasks\Uninstall Crap\final-boss-of-edge.yml', option: 'uninstall-edge'}
89+
- !task: {path: 'Tasks\uninstall\final-boss-of-edge.yml', option: 'uninstall-edge'}
10590
# Removing using AME Wizard causes issues with Cross Device Experience Host installing
10691
# - !appx: {name: 'Microsoft.YourPhone*', type: family}
10792
- !powerShell:
@@ -110,6 +95,15 @@ actions:
11095
Get-AppxProvisionedPackage -Online | Where-Object { $_.DisplayName -eq 'Microsoft.YourPhone' } | Remove-AppxProvisionedPackage -Online
11196
runas: currentUserElevated
11297
wait: true
98+
option: 'remove-yourphone'
99+
- !powerShell:
100+
command: |
101+
Get-AppxPackage MicrosoftWindows.CrossDevice | Remove-AppxPackage
102+
Get-AppxProvisionedPackage -Online | Where-Object { $_.DisplayName -eq 'MicrosoftWindows.CrossDevice' } | Remove-AppxProvisionedPackage -Online
103+
runas: currentUserElevated
104+
wait: true
105+
option: 'remove-yourphone'
106+
113107

114108
# Prevent provisioned applications from being reinstalled
115109
# https://learn.microsoft.com/en-us/windows/application-management/remove-provisioned-apps-during-update

Configuration/Main/components.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,21 @@ actions:
2121

2222
# OneDrive
2323
# The actual OneDrive setup in Windows is stripped at a component-level in the miscellaneous package
24-
- !task: {path: 'Tasks\Uninstall Crap\onedrive.yml', option: 'uninstall-oned'}
24+
- !task: {path: 'Tasks\uninstall\onedrive.yml', option: 'uninstall-oned'}
2525

2626
# Windows components and Telemetry
2727
- !writeStatus: {status: 'Removing components'}
2828
- !powerShell:
2929
command: >-
3030
& """$([Environment]::GetFolderPath('Windows'))\AtmosphereModules\Scripts\packageInstall.ps1"""
31-
-InstallPackages @('*Z-Atmosphere-NoDefender-Package*',
32-
'*Z-Atmosphere-NoTelemetry-Package*'
33-
)
31+
-InstallPackages @('*Z-Atmosphere-NoTelemetry-Package*')
3432
-NoInteraction
35-
option: 'defender-disable'
3633
wait: true
3734
exeDir: true
3835
- !powerShell:
3936
command: >-
4037
& """$([Environment]::GetFolderPath('Windows'))\AtmosphereModules\Scripts\packageInstall.ps1"""
41-
-InstallPackages @('*Z-Atmosphere-NoTelemetry-Package*')
42-
-UninstallPackages @('*Z-Atmosphere-NoDefender-Package*')
38+
-UninstallPackages @('*Z-AME-NoDefender-Package*')
4339
-NoInteraction
4440
option: 'defender-enable'
4541
wait: true

Configuration/Main/files.yml

Lines changed: 0 additions & 191 deletions
This file was deleted.

Configuration/Main/services.yml

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -45,51 +45,8 @@ actions:
4545
##############################################################################################
4646

4747
- !writeStatus: {status: 'Configuring services'}
48-
- !registryKey: {path: "HKLM\\System\\CurrentControlSet\\Services\\WdNisDrv", errorAction: Log}
49-
- !registryKey: {path: "HKLM\\System\\CurrentControlSet001\\Services\\WdNisDrv", errorAction: Log}
50-
- !registryKey: {path: "HKLM\\System\\CurrentControlSet\\Services\\WdNisSvc", errorAction: Log}
51-
- !registryKey: {path: "HKLM\\System\\CurrentControlSet001\\Services\\WdNisSvc", errorAction: Log}
52-
- !taskKill: {name: "devicecensus"}
53-
- !taskKill: {name: "UsoClient"}
54-
- !taskKill: {name: "MoUsoCoreWorker"}
55-
- !service: {name: "WaaSMedicSvc", operation: stop}
56-
- !service: {name: "WpcMonSvc", operation: delete}
57-
- !service: {name: "WMPNetworkSvc", operation: delete}
58-
- !service: {name: "StorSvc", operation: stop}
59-
- !service: {name: "wisvc", operation: stop}
60-
# Breaks virtual/cloud files which is required by many sync services like Nextcloud/Proton
61-
# - !service: {name: "CldFlt", operation: delete, device: true}
62-
# - !service: {name: "Sense", operation: delete}
63-
- !service: {name: "webthreatdefusersvc*", operation: delete, ignoreErrors: true}
64-
- !service: {name: "webthreatdefsvc", operation: delete, deleteUsingRegistry: true}
65-
- !service: {name: "UevAgentService", operation: delete}
66-
- !service: {name: "cloudidsvc", operation: delete}
67-
- !taskKill: {name: "SecurityHealthSystray"}
68-
- !taskKill: {name: "SecurityHealthService"}
69-
- !service: {name: "SecurityHealthService", operation: stop}
70-
- !service: {name: "wscsvc", operation: stop}
71-
- !service: {name: "BITS", operation: stop}
72-
- !service: {name: "DoSvc", operation: stop}
73-
- !service: {name: "iphlpsvc", operation: stop}
74-
- !service: {name: "WSearch", operation: stop, option: 'openshell'}
75-
- !service: {name: "Winmgmt", operation: stop}
76-
- !service: {name: "ClipSVC", operation: stop}
77-
- !service: {name: "DiagTrack", operation: delete}
78-
- !service: {name: "RetailDemo", operation: stop}
79-
- !service: {name: "diagnosticshub.standardcollector.service", operation: stop}
80-
- !service: {name: "dmwappushservice", operation: stop}
81-
- !service: {name: "InstallService", operation: stop}
82-
- !service: {name: "LicenseManager", operation: stop}
83-
- !service: {name: "lfsvc", operation: stop}
84-
- !service: {name: "MapsBroker", operation: stop}
85-
- !service: {name: "NetTcpPortSharing", operation: stop}
86-
- !service: {name: "RemoteAccess", operation: stop}
87-
- !service: {name: "RemoteRegistry", operation: stop}
88-
- !service: {name: "SharedAccess", operation: stop}
89-
- !service: {name: "TrkWks", operation: stop}
90-
- !service: {name: "WbioSrvc", operation: stop}
9148
- !service: {name: "WSearch", operation: change, startup: 4, option: 'openshell'}
92-
# - !service: {name: "BITS", operation: change, startup: 3} i need to research this a bit
49+
# - !service: {name: "BITS", operation: change, startup: 3} # i need to research this a bit
9350
# Firewall rules to prevent the startmenu from talking
9451
- !registryValue: {path: 'HKLM\SYSTEM\ControlSet001\Services\SharedAccess\Parameters\FirewallPolicy\FirewallRules', value: 'Block SearchApp', type: REG_SZ, data: 'v2.32|Action=Block|Active=TRUE|Dir=Out|RA42=IntErnet|RA62=IntErnet|App=%SystemRoot%\SystemApps\Microsoft.Windows.Search_cw5n1h2txyewy\SearchApp.exe|Name=Block SearchApp|Desc=Block Cortana Outbound UDP/TCP Traffic|'}
9552
- !registryValue: {path: 'HKLM\SYSTEM\ControlSet001\Services\SharedAccess\Parameters\FirewallPolicy\FirewallRules', value: 'Block SearchHost', type: REG_SZ, data: 'v2.32|Action=Block|Active=TRUE|Dir=Out|RA42=IntErnet|RA62=IntErnet|App=%SystemRoot%\SystemApps\MicrosoftWindows.Client.CBS_cw5n1h2txyewy\SearchHost.exe|Name=Block SearchHost|Desc=Block Cortana Outbound UDP/TCP Traffic|'}

Configuration/Main/start.yml

Lines changed: 1 addition & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -48,74 +48,6 @@ actions:
4848
- !run: {exe: 'DISM.exe', args: '/Online /Remove-Capability /CapabilityName:"App.StepsRecorder~~~~0.0.1.0" /NoRestart', weight: 30}
4949

5050
- !writeStatus: {status: 'Cleaning the component store'}
51-
- !run: {exe: 'DISM.exe', args: '/Online /Cleanup-Image /StartComponentCleanup', weight: 50}
51+
- !run: {exe: 'DISM.exe', args: '/Online /Cleanup-Image /StartComponentCleanup', weight: 50, wait: false} # Stubborn
5252

53-
# Initial software
54-
# 7-Zip, Visual C++ Runtimes, DirectX
55-
- !writeStatus: {status: 'Installing utilities'}
56-
- !powerShell:
57-
command: '.\SOFTWARE.ps1'
58-
exeDir: true
59-
wait: true
60-
weight: 150
61-
runas: currentUserElevated
62-
63-
# Browsers
64-
- !writeStatus: {status: 'Installing Brave', option: 'browser-brave'}
65-
- !powerShell:
66-
command: '.\SOFTWARE.ps1 -Brave'
67-
exeDir: true
68-
wait: true
69-
weight: 120
70-
option: 'browser-brave'
71-
runas: currentUserElevated
72-
- !writeStatus: {status: 'Installing Firefox', option: 'browser-firefox'}
73-
- !powerShell:
74-
command: '.\SOFTWARE.ps1 -Firefox'
75-
exeDir: true
76-
wait: true
77-
weight: 120
78-
option: 'browser-firefox'
79-
runas: currentUserElevated
80-
- !run:
81-
exe: 'FIREFOX.cmd'
82-
exeDir: true
83-
wait: true
84-
weight: 120
85-
option: 'browser-firefox'
86-
runas: currentUserElevated
87-
- !writeStatus: {status: 'Installing LibreWolf', option: 'browser-librewolf'}
88-
- !powerShell:
89-
command: '.\LIBREWOLF.ps1'
90-
exeDir: true
91-
wait: true
92-
weight: 120
93-
option: 'browser-librewolf'
94-
runas: currentUserElevated
95-
- !writeStatus: {status: 'Installing Google Chrome', option: 'browser-chrome'}
96-
- !powerShell:
97-
command: '.\SOFTWARE.ps1 -Chrome'
98-
exeDir: true
99-
wait: true
100-
weight: 120
101-
option: 'browser-chrome'
102-
runas: currentUserElevated
103-
- !writeStatus: {status: 'Installing OperaGX', option: 'browser-operagx'}
104-
- !powerShell:
105-
command: '.\SOFTWARE.ps1 -OperaGX'
106-
exeDir: true
107-
wait: true
108-
weight: 120
109-
option: 'browser-operagx'
110-
runas: currentUserElevated
111-
112-
# Open-Shell
113-
- !writeStatus: {status: 'Modifying the Start Menu', option: 'openshell'}
114-
- !powerShell:
115-
command: '.\SOFTWARE.ps1 -OpenShell'
116-
exeDir: true
117-
wait: true
118-
weight: 120
119-
option: 'openshell'
120-
runas: currentUserElevated
12153
################ END NO LOCAL BUILD ################

Configuration/Tasks/Registry/privacy/apps/disable-office-telemetry.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

Configuration/Tasks/Registry/qol/appearance/modify-ui.yml

Lines changed: 0 additions & 12 deletions
This file was deleted.
Lines changed: 129 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
---
2+
title: AppX
3+
description: Removes AppX packages and prevents them from being reinstalled
4+
actions:
5+
- !writeStatus: {status: 'Removing AppX packages'}
6+
7+
# The reason of removing those applications is that they might be sending user data,
8+
# showing unwanted content and using hardware resources. They can also simply be annoyances
9+
# that are never used. However, most of these applications can be reinstalled via
10+
# Microsoft Store in case the user needs them.
11+
12+
# https://docs.microsoft.com/en-us/windows/application-management/apps-in-windows-10
13+
14+
#####################################################################################################
15+
16+
# Get current AppX packages to deprovision removed ones afterward
17+
- !powerShell:
18+
command: |
19+
(Get-AppxPackage).PackageFamilyName |
20+
Out-File """$([Environment]::GetFolderPath('Windows'))\AtmosphereModules\AtmospherePackagesOld.txt"""
21+
runas: currentUserElevated
22+
wait: true
23+
24+
# AppX Microsoft Teams
25+
# Seems legacy - not in 23H2
26+
- !taskKill: {name: 'msteams*', ignoreErrors: true}
27+
- !appx: {name: 'MicrosoftTeams*', type: family}
28+
- !registryValue: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Communications', value: 'ConfigureChatAutoInstall', data: '0', type: REG_DWORD}
29+
30+
# New AppX Teams in 24H2
31+
- !taskKill: {name: 'ms-teams*', ignoreErrors: true}
32+
- !appx: {name: 'MSTeams*', type: family}
33+
# 24H2 Copilot app
34+
- !appx: {name: 'Microsoft.Copilot*', type: family}
35+
36+
# Other apps
37+
- !appx: {name: 'Clipchamp.Clipchamp*', type: family}
38+
- !appx: {name: 'Disney.37853FC22B2CE*', type: family}
39+
# - !appx: {name: 'SpotifyAB.SpotifyMusic*', type: family} # 99% sure this will uninstall someones spotify
40+
- !appx: {name: 'Microsoft.549981C3F5F10*', type: family} # Cortana
41+
# - !appx: {name: 'Microsoft.XboxApp*', type: family} # Xbox Console Companion (deprecated)
42+
- !appx: {name: 'microsoft.windowscommunicationsapps*', type: family} # Mail and Calendar
43+
- !appx: {name: 'Microsoft.MSPaint*', type: family} # Paint 3D
44+
- !appx: {name: 'Microsoft.Getstarted*', type: family} # Tips (deprecated)
45+
- !appx: {name: 'Microsoft.ZuneVideo*', type: family} # Films & TV
46+
- !appx: {name: 'MicrosoftCorporationII.MicrosoftFamily*', type: family}
47+
- !appx: {name: 'Microsoft.MixedReality.Portal*', type: family}
48+
- !appx: {name: 'Microsoft.Windows.DevHome*', type: family}
49+
- !appx: {name: 'Microsoft.BingWeather*', type: family}
50+
- !appx: {name: 'Microsoft.BingNews*', type: family}
51+
- !appx: {name: 'Microsoft.BingSearch*', type: family}
52+
- !appx: {name: 'Microsoft.OutlookForWindows*', type: family}
53+
- !appx: {name: '*OneDrive*', type: family, option: 'uninstall-oned'}
54+
- !appx: {name: 'Microsoft.GetHelp*', type: family}
55+
- !appx: {name: 'Microsoft.Microsoft3DViewer*', type: family}
56+
- !appx: {name: 'Microsoft.MicrosoftOfficeHub*', type: family}
57+
- !appx: {name: 'Microsoft.MicrosoftSolitaireCollection*', type: family}
58+
- !appx: {name: 'Microsoft.MicrosoftStickyNotes*', type: family}
59+
- !appx: {name: 'Microsoft.Office.OneNote*', type: family}
60+
- !appx: {name: 'Microsoft.People*', type: family}
61+
- !appx: {name: 'Microsoft.PowerAutomateDesktop*', type: family}
62+
- !appx: {name: 'Microsoft.ScreenSketch*', type: family, option: 'remove-snipping-tool'}
63+
- !appx: {name: 'Microsoft.SkypeApp*', type: family}
64+
- !appx: {name: 'Microsoft.Todos*', type: family}
65+
- !appx: {name: 'Microsoft.WindowsAlarms*', type: family}
66+
- !appx: {name: 'Microsoft.WindowsCamera*', type: family}
67+
- !appx: {name: 'Microsoft.WindowsFeedbackHub*', type: family}
68+
- !appx: {name: 'Microsoft.WindowsMaps*', type: family}
69+
- !appx: {name: 'Microsoft.WindowsSoundRecorder*', type: family}
70+
- !appx: {name: 'Microsoft.OutlookForWindows*', type: family}
71+
- !appx: {name: 'MicrosoftCorporationII.QuickAssist*', type: family}
72+
- !appx: {name: 'Microsoft.Windows.NarratorQuickStart*', type: family}
73+
- !appx: {name: 'Microsoft.Windows.ParentalControls*', type: family}
74+
- !appx: {name: 'Microsoft.Windows.PeopleExperienceHost*', type: family}
75+
- !appx: {name: 'Microsoft.MicrosoftEdgeDevToolsClient*', type: family}
76+
- !appx: {name: 'Microsoft.BioEnrollment*', type: family} # Windows Hello
77+
- !appx: {name: 'Microsoft.Ink.Handwriting*', type: family}
78+
- !appx: {name: 'Microsoft.Wallet*', type: family}
79+
- !appx: {name: 'Microsoft.Xbox', type: family}
80+
- !appx: {name: '*XboxApp*', type: family}
81+
- !appx: {name: '*XboxGameCallableUI*', type: family}
82+
- !appx: {name: '*GamingApp*', type: family}
83+
# - !appx: {name: '*StartMenuExperienceHost*', type: family, option: 'openshell'} keep this incase smth goes wrong
84+
- !appx: {name: '*WindowsStore*', type: family}
85+
- !appx: {name: '*StorePurchaseApp*', type: family}
86+
- !appx: {name: '*SecureAssessmentBrowser*', type: family}
87+
- !appx: {name: '*AssignedAccessLockApp*', type: family}
88+
- !appx: {name: '*OOBENetwork*', type: family}
89+
- !appx: {name: '*Apprep.Chx*', type: family}
90+
- !appx: {name: '*Global.IrisService*', type: app}
91+
- !appx: {name: '*Global.Accounts*', type: app}
92+
- !appx: {name: '*Global.ValueBanner*', type: app}
93+
- !appx: {name: '*Global.DesktopSpotlight*', type: app}
94+
- !appx: {name: '*WindowsBackup*', type: app}
95+
96+
# Removing using AME Wizard causes issues with Cross Device Experience Host installing
97+
# - !appx: {name: 'Microsoft.YourPhone*', type: family}
98+
- !powerShell:
99+
command: |
100+
Get-AppxPackage Microsoft.YourPhone* | Remove-AppxPackage
101+
Get-AppxProvisionedPackage -Online | Where-Object { $_.DisplayName -eq 'Microsoft.YourPhone' } | Remove-AppxProvisionedPackage -Online
102+
runas: currentUserElevated
103+
wait: true
104+
option: 'remove-yourphone'
105+
- !powerShell:
106+
command: |
107+
Get-AppxPackage MicrosoftWindows.CrossDevice | Remove-AppxPackage
108+
Get-AppxProvisionedPackage -Online | Where-Object { $_.DisplayName -eq 'MicrosoftWindows.CrossDevice' } | Remove-AppxProvisionedPackage -Online
109+
runas: currentUserElevated
110+
wait: true
111+
option: 'remove-yourphone'
112+
113+
# Prevent provisioned applications from being reinstalled
114+
# https://learn.microsoft.com/en-us/windows/application-management/remove-provisioned-apps-during-update
115+
- !powerShell:
116+
command: |
117+
$a = """$([Environment]::GetFolderPath('Windows'))\AtmosphereModules\AtmospherePackagesOld.txt"""
118+
(diff (gc $a) ((Get-AppxPackage).PackageFamilyName)).InputObject |
119+
Foreach-Object { New-Item -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\AppxAllUserStore\Deprovisioned" -Name $_ -Force };
120+
Remove-Item $a -Force
121+
runas: currentUserElevated
122+
wait: true
123+
124+
# Clear caches of Client.CBS and more
125+
# Start menu cache is cleared later
126+
- !writeStatus: {status: 'Clearing AppX caches'}
127+
- !appx: {operation: clearCache, name: '*MicrosoftWindows.Client.CBS*'}
128+
- !appx: {operation: clearCache, name: '*Microsoft.Windows.Search*'}
129+
- !appx: {operation: clearCache, name: '*Microsoft.Windows.SecHealthUI*'}

0 commit comments

Comments
 (0)