Merge branch 'new-ame' into dev

src/playbook/Configuration/atlas/appx.yml

@@ -35,6 +35,7 @@ actions:
 
   # Content Delivery Manager
   # Installs unwanted content such as apps like Disney+ and advertisements
+  # Removed at a component level as well
   - !appx: {name: '*Microsoft.Windows.ContentDeliveryManager*', type: family}
 
   # Dev Home
@@ -61,16 +62,16 @@ actions:
 
   # Get Started
   - !appx: {name: '*Microsoft.Getstarted*', type: family}
-  - !appx: {name: '*WebExperienceHost*', type: app}
+  - !appx: {name: '*WebExperienceHost*', type: app, unregister: true}
 
   # Windows Backup
-  - !appx: {name: '*WindowsBackup*', type: app}
+  - !appx: {name: '*WindowsBackup*', type: app, unregister: true}
 
   # Advertisements/Telemetry
-  - !appx: {name: '*Global.Accounts*', type: app}
-  - !appx: {name: '*Global.BackupBanner*', type: app}
-  - !appx: {name: '*Global.IrisService*', type: app}
-  - !appx: {name: '*Global.ValueBanner*', type: app}
+  - !appx: {name: '*Global.Accounts*', type: app, unregister: true}
+  - !appx: {name: '*Global.BackupBanner*', type: app, unregister: true}
+  - !appx: {name: '*Global.IrisService*', type: app, unregister: true}
+  - !appx: {name: '*Global.ValueBanner*', type: app, unregister: true}
 
   - !run:
     exe: 'powershell.exe'

src/playbook/Configuration/atlas/components.yml

@@ -24,9 +24,10 @@ actions:
     # Microsoft Edge
   - !writeStatus: {status: 'Removing Microsoft Edge', option: 'uninstall-edge'}
   - !cmd:
-    command: 'NSudoLC.exe -U:E -UseCurrentConsole -Wait powershell.exe -NoP -EP Unrestricted -File "%windir%\AtlasDesktop\1. Software\Remove Edge.ps1" -UninstallEdge -KeepAppX -Exit'
+    command: 'powershell.exe -NoP -EP Unrestricted -File "%windir%\AtlasDesktop\1. Software\Remove Edge.ps1" -UninstallEdge -KeepAppX -Exit'
     wait: true
     exeDir: true
+    runas: currentUserElevated
     option: 'uninstall-edge'
     # AppX uninstallation in the script seems to fail with NSudo, therefore it's not used and AME Wizard is used instead
   - !appx: {name: '*Microsoft.MicrosoftEdge.Stable*', type: family, option: 'uninstall-edge'}

src/playbook/Configuration/atlas/services.yml

@@ -38,6 +38,8 @@ actions:
   - !service: {name: 'WerSvc', operation: change, startup: 4}
   - !service: {name: 'wisvc', operation: change, startup: 4}
   - !service: {name: 'WSearch', operation: change, startup: 4}
+  - !service: {name: 'webthreatdefsvc', operation: change, startup: 4}
+  - !service: {name: 'webthreatdefusersvc', operation: change, startup: 4}
 
     # Set to manual from automatic
     # Might not be all too beneficial, as services starting and always being ready is probably ideal

src/playbook/Configuration/atlas/start.yml

@@ -39,7 +39,7 @@ actions:
 
   - !writeStatus: {status: 'Configuring Optional Features'}
     # Disabled for security purposes
-  - !run: {exe: 'DISM.exe', args: '/Online /Disable-Feature /FeatureName:"Internet-Explorer-Optional-amd64" /NoRestart', weight: 30}
+  - !run: {exe: 'DISM.exe', args: '/Online /Disable-Feature /FeatureName:"Internet-Explorer-Optional-amd64" /NoRestart', weight: 30, builds: [ '!>=22000' ]}
   - !run: {exe: 'DISM.exe', args: '/Online /Disable-Feature /FeatureName:"MicrosoftWindowsPowerShellV2" /NoRestart', weight: 30}
   - !run: {exe: 'DISM.exe', args: '/Online /Disable-Feature /FeatureName:"MicrosoftWindowsPowerShellV2Root" /NoRestart', weight: 30}
 

src/playbook/Configuration/custom.yml

@@ -4,8 +4,6 @@ description: Runs all of the playbook files
 privilege: TrustedInstaller
 actions: []
 tasks:
-  # Remove KProcessHacker2 to prevent conflicts with the Microsoft Vulnerable Driver Blocklist and Memory Integrity
-  - atlas\kill-kph.yml
   # Configure PowerShell first so that other PowerShell scripts work
   - tweaks\qol\config-powershell.yml
   - atlas\start.yml

src/playbook/Configuration/tweaks.yml

@@ -162,6 +162,7 @@ tasks:
   - tweaks\qol\visual-effects.yml
   - tweaks\qol\disable-tips.yml
   - tweaks\qol\disable-consumer-expierences.yml
+  - tweaks\qol\set-hidden-settings-pages.yml
 
   # -------------------------------------------------------------------------- #
   #  qol\appearance                                                            #
@@ -210,6 +211,9 @@ tasks:
   - tweaks\qol\explorer\show-files.yml
   - tweaks\qol\explorer\add-music-vids-to-home.yml
   - tweaks\qol\explorer\classic-search.yml
+  - tweaks\qol\explorer\dont-show-office-files.yml
+  - tweaks\qol\explorer\use-compact-mode.yml
+  - tweaks\qol\explorer\disable-gallery.yml
 
   # -------------------------------------------------------------------------- #
   #  qol\explorer\add-context-menus                                            #
@@ -253,6 +257,10 @@ tasks:
   - tweaks\qol\shell\disable-network-location-wizard.yml
   - tweaks\qol\shell\disable-shared-experiences.yml
   - tweaks\qol\shell\legacy-alt-tab.yml
+  - tweaks\qol\shell\set-unpinned-notification-items.yml
+  - tweaks\qol\shell\restore-old-context-menu.yml
+  - tweaks\qol\shell\show-more-pins.yml
+  - tweaks\qol\shell\no-recommendations-start-menu.yml
 
   # -------------------------------------------------------------------------- #
   #  qol\startup-shutdown                                                      #
@@ -279,6 +287,9 @@ tasks:
   - tweaks\qol\taskbar\hide-meet-now.yml
   - tweaks\qol\taskbar\hide-task-view.yml
   - tweaks\qol\taskbar\config-pins.yml
+  - tweaks\qol\taskbar\disable-copilot.yml
+  - tweaks\qol\taskbar\disable-windows-chat.yml
+  - tweaks\qol\taskbar\set-to-left.yml
 
   # -----------------------------------------------------
   #                       Security
@@ -325,7 +336,6 @@ tasks:
   - tweaks\scripts\script-file-associations.yml
   - tweaks\scripts\script-core-isolation.yml
   - tweaks\scripts\script-mitigations.yml
-  - tweaks\scripts\script-win11.yml
   - tweaks\scripts\script-devices.yml
   - tweaks\scripts\script-pfp.yml
   - tweaks\scripts\script-power.yml
@@ -350,4 +360,5 @@ tasks:
   - tweaks\misc\oem-information.yml
   - tweaks\misc\rebuild-perf-counters.yml
   - tweaks\misc\restore-default-sleep-timeout.yml
-  - tweaks\misc\make-shortcuts.yml
+  - tweaks\misc\make-shortcuts.yml
+  - tweaks\misc\delete-version-specific-files.yml

src/playbook/Configuration/tweaks/misc/config-boot-description.yml

@@ -0,0 +1,13 @@
+---
+title: Configure Boot Description
+description: Configures the boot description that you see in the Windows Boot Manager to say Atlas
+privilege: TrustedInstaller
+actions:
+  - !run:
+    exe: 'bcdedit'
+    args: '/set description "AtlasOS 10"'
+    builds: [ '!>=22000' ]
+  - !run:
+    exe: 'bcdedit'
+    args: '/set description "AtlasOS 11"'
+    builds: [ '>=22000' ]

src/playbook/Configuration/tweaks/misc/delete-version-specific-files.yml

@@ -0,0 +1,15 @@
+---
+title: Delete Windows-version Specific Tweaks
+description: Deletes Windows 10 or Windows 11-only tweaks in the Atlas folder, dependant on the Windows version
+privilege: TrustedInstaller
+actions:
+    # Delete Windows 11-only tweaks
+  - !file: {path: '%windir%\AtlasDesktop\3. Configuration\Background Apps', builds: [ '!>=22000' ]}
+  - !file: {path: '%windir%\AtlasDesktop\3. Configuration\Power\Timer Resolution', builds: [ '!>=22000' ]}
+  - !file: {path: '%windir%\AtlasDesktop\4. Optional Tweaks\File Explorer Customization\Compact View', builds: [ '!>=22000' ]}
+  - !file: {path: '%windir%\AtlasDesktop\4. Optional Tweaks\File Explorer Customization\Gallery', builds: [ '!>=22000' ]}
+  - !file: {path: '%windir%\AtlasDesktop\4. Optional Tweaks\Windows 11 Context Menu', builds: [ '!>=22000' ]}
+  - !file: {path: '%windir%\AtlasModules\Tools\TimerResolution.exe', builds: [ '!>=22000' ]}
+
+    # Delete Windows 10-only tweaks
+  - !file: {path: '%windir%\AtlasDesktop\3. Configuration\4. Optional Tweaks\Volume Flyout', builds: [ '>=22000' ]}

src/playbook/Configuration/tweaks/misc/restore-default-sleep-timeout.yml

@@ -2,6 +2,7 @@
 title: Restore Default Sleep Timeout
 description: If the power saving option is disabled, this restores the default automatic sleep timeout
 privilege: TrustedInstaller
+option: '!disable-power-saving'
 actions:
-  - !run: {exe: 'powercfg.exe', args: '/setacvalueindex scheme_current sub_sleep standbyidle 900', option: '!disable-power-saving'}
-  - !run: {exe: 'powercfg.exe', args: '/setdcvalueindex scheme_current sub_sleep standbyidle 600', option: '!disable-power-saving'}
+  - !run: {exe: 'powercfg.exe', args: '/setacvalueindex scheme_current sub_sleep standbyidle 900'}
+  - !run: {exe: 'powercfg.exe', args: '/setdcvalueindex scheme_current sub_sleep standbyidle 600'}

src/playbook/Configuration/tweaks/performance/system/config-boot-config.yml

@@ -9,3 +9,13 @@ actions:
 
     # Use legacy boot menu
   - !run: {exe: 'bcdedit', args: '/set bootmenupolicy Legacy'}
+
+    # Set boot manager descriptions
+  - !run:
+    exe: 'bcdedit'
+    args: '/set description "AtlasOS 10"'
+    builds: [ '!>=22000' ]
+  - !run:
+    exe: 'bcdedit'
+    args: '/set description "AtlasOS 11"'
+    builds: [ '>=22000' ]

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

@@ -10,10 +10,11 @@ actions:
     wait: true
 
     # Apply theme to current user
-  - !run:
-    exe: 'NSudoLC.exe'
-    args: '-U:E -UseCurrentConsole -Wait cmd /c start "" "%windir%\Resources\Themes\atlas-dark.theme"'
+  - !cmd:
+    command: 'start "" "%windir%\Resources\Themes\atlas-dark.theme"'
+    wait: true
     exeDir: true
+    runas: currentUser
   - !cmd: {command: 'timeout /t 3 /nobreak', wait: true}
 
   - !taskKill: {name: 'SystemSettings'}

src/playbook/Configuration/tweaks/qol/explorer/add-music-vids-to-home.yml

@@ -3,7 +3,9 @@ title: Add Music and Videos folders to Quick Access
 description: Adds the 'Music' and 'Videos' folders to Quick Access/Home as they're unpinned by default with recent files being disabled. Win11 fix is available in WIN11.cmd.
 privilege: TrustedInstaller
 actions:
-  - !run:
-    exe: 'NSudoLC.exe'
-    args: '-U:E -UseCurrentConsole -Wait powershell.exe -NoP -EP Unrestricted -C "$o = new-object -com shell.application; $o.Namespace("""$env:userprofile\Videos""").Self.InvokeVerb(''pintohome''); $o.Namespace("""$env:userprofile\Music""").Self.InvokeVerb(''pintohome'')"'
+  - !powerShell:
+    command: '$o = new-object -com shell.application; $o.Namespace("""$env:userprofile\Videos""").Self.InvokeVerb(''pintohome''); $o.Namespace("""$env:userprofile\Music""").Self.InvokeVerb(''pintohome'')"'
+    wait: true
     exeDir: true
+    runas: currentUserElevated
+

src/playbook/Configuration/tweaks/qol/explorer/disable-gallery.yml

@@ -0,0 +1,11 @@
+---
+title: Hide Gallery in File Explorer
+description: Hides the new 23H2 'Gallery' in File Explorer for viewing pictures
+privilege: TrustedInstaller
+builds: [ '>=22000' ]
+actions:
+  - !registryValue:
+    path: 'HKCU\SOFTWARE\Classes\CLSID\{e88865ea-0e1c-4e20-9aa6-edcd0212c87c}'
+    value: 'System.IsPinnedToNameSpaceTree'
+    data: '0'
+    type: REG_DWORD

src/playbook/Configuration/tweaks/qol/explorer/dont-show-office-files.yml

@@ -0,0 +1,11 @@
+---
+title: Don't Show Office Files
+description: Don't show Office files in Quick Access (Home)
+privilege: TrustedInstaller
+builds: [ '>=22000' ]
+actions:
+  - !registryValue:
+    path: 'HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer'
+    value: 'ShowCloudFilesInQuickAccess'
+    data: '0'
+    type: REG_DWORD

src/playbook/Configuration/tweaks/qol/explorer/remove-context-menus/new-bitmap.yml

@@ -4,3 +4,8 @@ description: Removes bitmap image from the 'New' context menu
 privilege: TrustedInstaller
 actions:
   - !registryKey: {path: 'HKCR\.bmp\ShellNew'}
+  - !run:
+    exe: 'powershell.exe'
+    args: '-NoP -File REMOVEBITMAP.ps1'
+    exeDir: true
+    wait: true

src/playbook/Configuration/tweaks/qol/explorer/use-compact-mode.yml

@@ -0,0 +1,11 @@
+---
+title: Use Compact Mode
+description: Sets compact mode in File Explorer
+privilege: TrustedInstaller
+builds: [ '>=22000' ]
+actions:
+  - !registryValue:
+    path: 'HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced'
+    value: 'UseCompactMode'
+    data: '1'
+    type: REG_DWORD

src/playbook/Configuration/tweaks/qol/set-hidden-settings-pages.yml

@@ -0,0 +1,22 @@
+---
+title: Set Hidden Pages
+description: Hides Settings pages that are either broken or unused
+privilege: TrustedInstaller
+actions:
+    # https://learn.microsoft.com/en-us/windows/uwp/launch-resume/launch-settings-app
+
+    # Windows 10
+  - !registryValue:
+    path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer'
+    value: 'SettingsPageVisibility'
+    data: 'hide:crossdevice;recovery;autoplay;usb;maps;maps-downloadmaps;findmydevice;privacy;privacy-speech;privacy-feedback;privacy-activityhistory;search-permissions;privacy-location;privacy-general;sync;printers;cortana-windowssearch;mobile-devices;mobile-devices-addphone;backup;'
+    type: REG_SZ
+    builds: [ '!>=22000' ]
+
+    # Windows 11
+  - !registryValue:
+    path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer'
+    value: 'SettingsPageVisibility'
+    data: 'hide:crossdevice;recovery;autoplay;usb;maps;maps-downloadmaps;findmydevice;privacy;privacy-speech;privacy-feedback;privacy-activityhistory;search-permissions;privacy-location;privacy-general;sync;printers;cortana-windowssearch;mobile-devices;mobile-devices-addphone;family-group;deviceusage;home;'
+    type: REG_SZ
+    builds: [ '>=22000' ]

src/playbook/Configuration/tweaks/qol/shell/no-recommendations-start-menu.yml

@@ -0,0 +1,16 @@
+---
+title: Disable Recommendations in the Start Menu
+description: Do not show recommendations for tips, shortcuts, new apps, and more in the Start Menu
+privilege: TrustedInstaller
+builds: [ '>=22000' ]
+actions:
+  - !registryValue:
+    path: 'HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced'
+    value: 'Start_IrisRecommendations'
+    data: '0'
+    type: REG_DWORD
+  - !registryValue:
+    path: 'HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced'
+    value: 'Start_AccountNotifications'
+    data: '0'
+    type: REG_DWORD

src/playbook/Configuration/tweaks/qol/shell/restore-old-context-menu.yml

@@ -0,0 +1,11 @@
+---
+title: Restore Old Context Menu
+description: Restores the old context menu in Windows 11
+privilege: TrustedInstaller
+builds: [ '>=22000' ]
+actions:
+  - !registryValue:
+    path: 'HKCU\Software\Classes\CLSID\{86ca1aa0-34aa-4e8b-a509-50c905bae2a2}\InprocServer32'
+    value: ''
+    data: ''
+    type: REG_SZ

src/playbook/Configuration/tweaks/qol/shell/set-unpinned-notification-items.yml

@@ -0,0 +1,50 @@
+---
+title: Disable Windows Chat
+description: Disables Windows Chat as it's not commonly used
+privilege: TrustedInstaller
+actions:
+    # Windows 10
+  - !registryValue:
+    path: 'HKCU\Control Panel\Quick Actions\Control Center\Unpinned'
+    value: 'Microsoft.QuickAction.Connect'
+    data: ''
+    type: REG_NONE
+    builds: [ '!>=22000' ]
+  - !registryValue:
+    path: 'HKCU\Control Panel\Quick Actions\Control Center\Unpinned'
+    value: 'Microsoft.QuickAction.Location'
+    data: ''
+    type: REG_NONE
+    builds: [ '!>=22000' ]
+  - !registryValue:
+    path: 'HKCU\Control Panel\Quick Actions\Control Center\Unpinned'
+    value: 'Microsoft.QuickAction.ScreenClipping'
+    data: ''
+    type: REG_NONE
+    builds: [ '!>=22000' ]
+  - !registryValue:
+    path: 'HKCU\Control Panel\Quick Actions\Control Center\QuickActionsStateCapture'
+    value: 'Toggles'
+    data: 'Toggles,Microsoft.QuickAction.BlueLightReduction:false,Microsoft.QuickAction.AllSettings:false,Microsoft.QuickAction.Project:false'
+    type: REG_SZ
+    builds: [ '!>=22000' ]
+
+    # Windows 11
+  - !registryValue:
+    path: 'HKCU\Control Panel\Quick Actions\Control Center\Unpinned'
+    value: 'Microsoft.QuickAction.Cast'
+    data: ''
+    type: REG_NONE
+    builds: [ '>=22000' ]
+  - !registryValue:
+    path: 'HKCU\Control Panel\Quick Actions\Control Center\Unpinned'
+    value: 'Microsoft.QuickAction.NearShare'
+    data: ''
+    type: REG_NONE
+    builds: [ '>=22000' ]
+  - !registryValue:
+    path: 'HKCU\Control Panel\Quick Actions\Control Center\QuickActionsStateCapture'
+    value: 'Toggles'
+    data: 'Toggles,Microsoft.QuickAction.BlueLightReduction:false,Microsoft.QuickAction.Accessibility:false,Microsoft.QuickAction.ProjectL2:false'
+    type: REG_SZ
+    builds: [ '>=22000' ]

src/playbook/Configuration/tweaks/qol/shell/show-more-pins.yml

@@ -0,0 +1,11 @@
+---
+title: Show More Pins in Start
+description: Shows more pins in the Start Menu, meaning less recommendations
+privilege: TrustedInstaller
+builds: [ '>=22000' ]
+actions:
+  - !registryValue:
+    path: 'HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced'
+    value: 'Start_Layout'
+    data: '1'
+    type: REG_DWORD

src/playbook/Configuration/tweaks/qol/taskbar/disable-copilot.yml

@@ -0,0 +1,11 @@
+---
+title: Disable Windows Copilot
+description: Disables Windows Copilot as it depends on Edge, as well it collecting data and it not being used by most users
+privilege: TrustedInstaller
+builds: [ '>=22000' ]
+actions:
+  - !registryValue:
+    path: 'HKLM\Software\Policies\Microsoft\Windows\WindowsCopilot'
+    value: 'TurnOffWindowsCopilot'
+    data: '1'
+    type: REG_DWORD

src/playbook/Configuration/tweaks/qol/taskbar/disable-news-and-interests.yml

@@ -27,3 +27,10 @@ actions:
     data: '0'
     type: REG_DWORD
     operation: add
+    # Disable Widgets in taskbar
+  - !registryValue:
+    path: 'HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced'
+    value: 'TaskbarDa'
+    data: '0'
+    type: REG_DWORD
+    builds: [ '>=22000' ]