Merge branch 'main' into new-ame-wizard

src/playbook/Configuration/tweaks.yml

@@ -241,7 +241,6 @@ actions:
   #  qol\shell                                                                 #
   # -------------------------------------------------------------------------- #
   - !task: {path: 'tweaks\qol\shell\alt-tab-open-windows.yml'}
-  - !task: {path: 'tweaks\qol\shell\config-autorun-autoplay.yml'}
   - !task: {path: 'tweaks\qol\shell\disable-aero-shake.yml'}
   - !task: {path: 'tweaks\qol\shell\disable-low-disk-warning.yml'}
   - !task: {path: 'tweaks\qol\shell\disable-menu-delay.yml'}

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

@@ -8,14 +8,14 @@ actions:
   - !registryValue:
     path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer'
     value: 'SettingsPageVisibility'
-    data: 'hide:recovery;autoplay;usb;maps;maps-downloadmaps;findmydevice;privacy;privacy-speechtyping;privacy-speech;privacy-feedback;privacy-activityhistory;search-permissions;privacy-location;privacy-general;sync;cortana-windowssearch;mobile-devices;mobile-devices-addphone;workplace;backup'
+    data: 'hide:recovery;maps;maps-downloadmaps;findmydevice;privacy;privacy-speechtyping;privacy-speech;privacy-feedback;privacy-activityhistory;search-permissions;privacy-location;privacy-general;sync;cortana-windowssearch;mobile-devices;mobile-devices-addphone;workplace;backup'
     type: REG_SZ
     builds: [ '<22000' ]
 
     # Windows 11
   - !registryValue:
     path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer'
     value: 'SettingsPageVisibility'
-    data: 'hide:recovery;autoplay;usb;maps;maps-downloadmaps;findmydevice;privacy;privacy-feedback;privacy-activityhistory;search-permissions;privacy-location;privacy-general;sync;cortana-windowssearch;mobile-devices;mobile-devices-addphone;workplace;family-group;deviceusage;home'
+    data: 'hide:recovery;maps;maps-downloadmaps;findmydevice;privacy;privacy-feedback;privacy-activityhistory;search-permissions;privacy-location;privacy-general;sync;cortana-windowssearch;mobile-devices;mobile-devices-addphone;workplace;family-group;deviceusage;home'
     type: REG_SZ
     builds: [ '>=22000' ]

src/playbook/Configuration/tweaks/qol/shell/config-autorun.yml

@@ -0,0 +1,30 @@
+---
+title: Disable AutoRun
+description: Disables AutoRun, also known as AutoPlay, for optimal security
+actions:
+  - !registryValue:
+    path: 'HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers'
+    value: 'DisableAutoplay'
+    data: '1'
+    type: REG_DWORD
+  - !registryValue:
+    path: 'HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\EventHandlersDefaultSelection\CameraAlternate'
+    value: 'MSTakeNoAction'
+    data: ''
+    type: REG_NONE
+  - !registryValue:
+    path: 'HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\EventHandlersDefaultSelection\StorageOnArrival'
+    value: 'MSTakeNoAction'
+    data: ''
+    type: REG_NONE
+  - !registryValue:
+    path: 'HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\UserChosenExecuteHandlers\CameraAlternate\ShowPicturesOnArrival'
+    value: 'MSTakeNoAction'
+    data: ''
+    type: REG_NONE
+  - !registryValue:
+    path: 'HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\UserChosenExecuteHandlers\StorageOnArrival'
+    value: 'MSTakeNoAction'
+    data: ''
+    type: REG_NONE
+

src/playbook/Executables/FILEASSOC.cmd

@@ -36,10 +36,10 @@ if "%~1" == "Brave" set "associations=%baseAssociations% %braveAssociations%"
 if "%~1" == "LibreWolf" set "associations=%baseAssociations% %libreWolfAssociations%"
 if "%~1" == "Firefox" set "associations=%baseAssociations% %firefoxAssociations%"
 if "%~1" == "Google Chrome" set "associations=%baseAssociations% %chromeAssociations%"
-if exist "%ProgramFiles%\7-Zip\7zFM.exe" set 7zip=y
+if exist "%ProgramFiles%\7-Zip\7zFM.exe" set sevenZip=y
 
 :: Set 7-Zip assocations
-if "%7zip%"=="y" call :7ZIPSYSTEM
+if "%sevenZip%"=="y" call :7ZIPSYSTEM
 
 :: Make a temporary renamed PowerShell executable to bypass UCPD
 :: https://hitco.at/blog/windows-userchoice-protection-driver-ucpd/
@@ -53,7 +53,7 @@ copy /y "%powershellPath%" "%powershellTemp%" > nul
 for /f "usebackq tokens=2 delims=\" %%a in (`reg query HKU ^| findstr /r /x /c:"HKEY_USERS\\S-.*" /c:"HKEY_USERS\\AME_UserHive_[^_]*"`) do (
     reg query "HKU\%%a" | findstr /c:"Volatile Environment" /c:"AME_UserHive_" > nul && (
         echo Setting associations for "%%a"...
-        if "%7zip%"=="y" call :7ZIPUSER "%%a"
+        if "%sevenZip%"=="y" call :7ZIPUSER "%%a"
         "%powershellTemp%" -NoP -NonI -EP Bypass -File ASSOC.ps1 "Placeholder" "%%a" %associations%
     )
 )