Merge branch 'main' into ame-customisation

.github/workflows/filter.yaml

@@ -19,7 +19,7 @@ jobs:
       - name: Close pull requests that directly commit to main
         run: |
             comment="
-            You can not directly commit to the [\`main\`](https://github.com/Atlas) branch, read the contribution guide and only commit to [\`dev\`](https://github.com/Atlas/tree/dev).
+            You cannot directly commit to the [\`main\`](https://github.com/Atlas) branch, read the contribution guide and only commit to [\`dev\`](https://github.com/Atlas/tree/dev).
                 
             **Contribution Guidelines:** https://docs.atlasos.net/contributions
             "

src/Configuration/atlas/appx.yml

@@ -4,10 +4,17 @@ description: Removes APPX packages
 privilege: TrustedInstaller
 actions:
   - !writeStatus: {status: 'Removing APPX packages'}
+
+  # The reason of removing those applications is that there is a huge potential of them sending users'
+  # data, showing unwanted content including advertisements and using hardware resources. They can also
+  # simply be annoyances that are never used. However, most of these applications can be reinstalled
+  # via Microsoft Store in case user need them.
+
   # https://docs.microsoft.com/en-us/windows/application-management/apps-in-windows-10
 
-  # Comments - packages added back that do not get in the way of users at all, and are only dependencies or hidden, meaningless applications
-  # Most of these applications can be reinstalled via Microsoft Store for users that need them
+  # ------------------------------------------------------------------------------------------------ #
+  # Applications added back: Dependencies or hidden apps that do not get in the way of users.        #
+  # ------------------------------------------------------------------------------------------------ #
 
   # File Picker
   # - !appx: {name: '1527c705-839a-4832-9118-54d4Bd6a0c89*', type: family}
@@ -18,10 +25,11 @@ actions:
   # Add Folder Suggestions dialog
   # - !appx: {name: 'F46D4000-FD22-4DB4-AC8E-4E1DDDE828FE*', type: family}
 
-  # Windows Hello
+  # Related to Windows Hello - biometric (face and fingerprint recognition)
   # - !appx: {name: '*Microsoft.BioEnrollment*', type: family}
 
-  # Contains winget
+  # Used to install AppX and UWP applications in Windows
+  # Contains the Windows Package Manager
   # - !appx: {name: '*Microsoft.DesktopAppInstaller*', type: family}
 
   # Eye Control - dependency of Mixed Reality?
@@ -36,7 +44,7 @@ actions:
   # Dependency for Phone Link
   # - !appx: {name: '*Microsoft.Windows.CallingShellApp*', type: family}
 
-  # eGPUS?
+  # USB eject for external graphics cards
   # - !appx: {name: '*Microsoft.Windows.XGpuEjectDialog*', type: family}
 
   # Barcode Preview - harmless package, related to POS
@@ -48,7 +56,7 @@ actions:
   # - !appx: {name: '*Microsoft.LockApp*', type: family}
   # - !appx: {name: '*Microsoft.Windows.NarratorQuickStart*', type: family}
 
-  # ------------------------------------------------------------------------------------------ #
+  # ------------------------------------------------------------------------------------------------ #
 
   # Disney
   - !appx: {name: '*Disney*', type: family}
@@ -59,13 +67,10 @@ actions:
   # Cortana
   - !appx: {name: '*Microsoft.549981C3F5F10*', type: family}
 
-  # MixedReality Portal - Installable via Store
+  # Mixed Reality
   - !appx: {name: '*Microsoft.MixedReality.Portal*', type: family}
 
-  # Assigned Access bloat
-  - !appx: {name: '*Microsoft.Windows.AssignedAccessLockApp*', type: family}
-
-  # Installs APPX bloat
+  # Installs unwanted content such as apps like Disney+ and advertisements
   - !appx: {name: '*Microsoft.Windows.ContentDeliveryManager*', type: family}
 
   # Network connection should not be needed in OOBE
@@ -83,6 +88,7 @@ actions:
   - !appx: {name: '*microsoft.windowscommunicationsapps*', type: family}
 
   # Take a Test
+  # https://www.mdsec.co.uk/2021/03/phishing-users-to-take-a-test
   - !appx: {name: '*Microsoft.Windows.SecureAssessmentBrowser*', type: family}
 
   - !appx: {name: '*Microsoft.Advertising.Xaml*', type: family}
@@ -103,6 +109,7 @@ actions:
   - !appx: {name: '*Microsoft.ScreenSketch*', type: family}
   - !appx: {name: '*Microsoft.SkypeApp*', type: family}
   - !appx: {name: '*Microsoft.Wallet*', type: family}
+  - !appx: {name: '*Microsoft.Windows.AssignedAccessLockApp*', type: family}
   - !appx: {name: '*Microsoft.Windows.ParentalControls*', type: family}
   - !appx: {name: '*Microsoft.Windows.Photos*', type: family}
   - !appx: {name: '*Microsoft.WindowsAlarms*', type: family}
@@ -114,7 +121,7 @@ actions:
   - !appx: {name: '*Microsoft.ZuneMusic*', type: family}
   - !appx: {name: '*Microsoft.ZuneVideo*', type: family}
 
-  # Necessary to refresh start menu entries etc.
+  # Necessary to refresh start menu related entries
   - !appx: {operation: clearCache, name: '*Client.CBS*'}
   - !appx: {operation: clearCache, name: '*StartMenuExperienceHost*'}
   - !appx: {operation: clearCache, name: '*Windows.Search*'}

src/Configuration/atlas/components.yml

@@ -3,7 +3,12 @@ title: Components
 description: Removes certain Windows components
 privilege: TrustedInstaller
 actions:
-    # Note: Some of this is redundant with packages.yml
+
+  # ------------------------- NOTES ------------------------- #
+
+  # - Some of this is redundant with packages.yml
+
+  # ----------------------- END NOTES ----------------------- #
 
   - !taskKill: {name: 'explorer'}
 
@@ -154,6 +159,9 @@ actions:
 
   - !run: {exeDir: true, exe: 'ONED.cmd', weight: 20}
 
+  - !cmd: {command: 'C:\Windows\System32\OneDriveSetup.exe /uninstall'}
+  - !cmd: {command: 'C:\Windows\SysWOW64\OneDriveSetup.exe /uninstall'}
+
   - !registryKey: {path: 'HKCR\CLSID\{018D5C66-4533-4307-9B53-224DE2ED1FE6}'}
   - !registryValue: {path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Run', value: 'OneDrive', operation: delete}
   - !registryKey: {path: 'HKCU\SOFTWARE\Microsoft\OneDrive'}
@@ -382,10 +390,10 @@ actions:
     path: 'C:\Program Files\PCHealthCheck'
 
   - !run: {exe: 'explorer.exe', wait: false}
+
     # This could be done in config.yml, however on the off-chance that
     # the Playbook fails or the system shuts down, we want the users converted
     # before potentially making any MS Accounts inoperable in packages.yml.
-
   - !run:
     exeDir: true
     exe: 'CONVERTUSERS.cmd'