diff --git a/.gitignore b/.gitignore index 7a8f7aa..c947d25 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -*.iso \ No newline at end of file +*.iso +disc-image/* \ No newline at end of file diff --git a/bin/hello/world.bat b/bin/hello/world.bat deleted file mode 100644 index e78c829..0000000 --- a/bin/hello/world.bat +++ /dev/null @@ -1 +0,0 @@ -echo hello world \ No newline at end of file diff --git a/bin/opus-nt/applyTweakIso.bat b/bin/opus-nt/applyTweakIso.bat new file mode 100644 index 0000000..98a513a --- /dev/null +++ b/bin/opus-nt/applyTweakIso.bat @@ -0,0 +1,5 @@ +if not exist %1\"iso" exit /b +echo applying %~n1... +xcopy %1\"iso" "tmp\disc-image" /e /y +echo. +exit /b \ No newline at end of file diff --git a/bin/opus-nt/applyTweakReg.bat b/bin/opus-nt/applyTweakReg.bat new file mode 100644 index 0000000..a4032a0 --- /dev/null +++ b/bin/opus-nt/applyTweakReg.bat @@ -0,0 +1,8 @@ +if not exist %1\"reg\%~n2" exit /b +echo applying %~n1... +for %%r in (%1\reg\%~n2\*) do ( + echo * %%~nr%%~xr... + reg import "%%r" +) +echo. +exit /b \ No newline at end of file diff --git a/bin/opus-nt/applyTweakScript.bat b/bin/opus-nt/applyTweakScript.bat new file mode 100644 index 0000000..7f976a2 --- /dev/null +++ b/bin/opus-nt/applyTweakScript.bat @@ -0,0 +1,5 @@ +if not exist %1\"script.bat" exit /b +echo applying %~n1... +call %1\"script.bat" +echo. +exit /b \ No newline at end of file diff --git a/bin/opus-nt/applyTweakWim.bat b/bin/opus-nt/applyTweakWim.bat new file mode 100644 index 0000000..9848ae5 --- /dev/null +++ b/bin/opus-nt/applyTweakWim.bat @@ -0,0 +1,5 @@ +if not exist %1\"wim" exit /b +echo applying %~n1... +xcopy %1\"wim" "tmp\wim" /e /y +echo. +exit /b \ No newline at end of file diff --git a/opus-files/reg/NTUSER/no onedrive auto-install.reg b/opus-files/reg/NTUSER/no onedrive auto-install.reg deleted file mode 100644 index 3df2e1f..0000000 Binary files a/opus-files/reg/NTUSER/no onedrive auto-install.reg and /dev/null differ diff --git a/opus-files/reg/NTUSER/show file extensions.reg b/opus-files/reg/NTUSER/show file extensions.reg deleted file mode 100644 index a2b2142..0000000 Binary files a/opus-files/reg/NTUSER/show file extensions.reg and /dev/null differ diff --git a/opus-files/reg/SOFTWARE/disable cortana.reg b/opus-files/reg/SOFTWARE/disable cortana.reg deleted file mode 100644 index 0220509..0000000 --- a/opus-files/reg/SOFTWARE/disable cortana.reg +++ /dev/null @@ -1,5 +0,0 @@ -Windows Registry Editor Version 5.00 - -[HKEY_LOCAL_MACHINE\FWIN_TMP\Policies\Microsoft\Windows\Windows Search] -"AllowCortana"=dword:00000000 - diff --git a/opus-files/reg/SOFTWARE/disable update from other PCs.reg b/opus-files/reg/SOFTWARE/disable update from other PCs.reg deleted file mode 100644 index 979858d..0000000 --- a/opus-files/reg/SOFTWARE/disable update from other PCs.reg +++ /dev/null @@ -1,5 +0,0 @@ -Windows Registry Editor Version 5.00 - -[HKEY_LOCAL_MACHINE\FWIN_TMP\Microsoft\Windows\CurrentVersion\DeliveryOptimization\Config] -"DODownloadMode"=dword:00000000 - diff --git a/opus-files/wim/SetupComplete disable update reboot/fwin10-setupcomplete/scripts/disable update reboot.bat b/opus-files/wim/SetupComplete disable update reboot/fwin10-setupcomplete/scripts/disable update reboot.bat deleted file mode 100644 index 5bec0cb..0000000 --- a/opus-files/wim/SetupComplete disable update reboot/fwin10-setupcomplete/scripts/disable update reboot.bat +++ /dev/null @@ -1,3 +0,0 @@ -schtasks /change /tn "\Microsoft\Windows\UpdateOrchestrator\Reboot" /disable -echo. >"%windir%\System32\Tasks\Microsoft\Windows\UpdateOrchestrator\Reboot" -echo y| cacls "%windir%\System32\Tasks\Microsoft\Windows\UpdateOrchestrator\Reboot" /D "SYSTEM" \ No newline at end of file diff --git a/patch-iso.bat b/patch-iso.bat index bea6062..830e067 100644 --- a/patch-iso.bat +++ b/patch-iso.bat @@ -1,6 +1,7 @@ @echo off setlocal EnableDelayedExpansion set workdir=%~dp0 +set tweakdir=%workdir%tweaks cd /d %workdir% :: expanding path with prerequisites @@ -9,15 +10,17 @@ for /d %%i in (bin\*) do set path=%cd%\%%i;!path! :: clearing temporary data if exist "tmp" ( echo. - echo unmounting windows image... + echo -- unmounting registry -- + reg unload HKLM\OPUS-NT_TMP + + echo. + echo. + echo -- unmounting windows image -- dism /unmount-image /mountdir:"tmp\wim" /discard echo. - echo unmounting registry... - reg unload HKLM\FWIN_TMP - echo. - echo removing tmp folder... + echo -- removing tmp folder -- rmdir "tmp" /s /q ) @@ -36,12 +39,14 @@ if "%1" == "console" ( mkdir tmp echo. -echo extracting disc-image... +echo. +echo -- extracting iso -- mkdir tmp\disc-image -7z x -o"tmp\disc-image" %1 +7z x -o"tmp\disc-image" "%1" echo. -echo mounting windows image... +echo. +echo -- mounting wmi -- mkdir tmp\wim dism /mount-image /index:1 /imagefile:"tmp\disc-image\sources\install.wim" /mountdir:"tmp\wim" @@ -53,72 +58,71 @@ if "%2" == "console" ( ) echo. -echo applying files to windows image... -for /d %%i in (opus-files\wim\*) do ( - echo applying: %%i - xcopy "%%i" "tmp\wim" /e /y +echo. +echo -- applying files to windows image -- +for /d %%t in (%tweakdir%\*) do ( + call "applyTweakWim.bat" "%%t" ) echo. -echo working registry... -cd "tmp\wim\windows\system32\config" -for %%i in (*) do ( +echo. +echo -- working registry -- +for %%r in (tmp\wim\windows\system32\config\*) do ( echo. - echo mounting: %%i - reg load HKLM\FWIN_TMP %%i - echo running tweaks for %%i... - for %%e in (%workdir%\opus-files\reg\%%i\*) do ( - echo applying: %%e - reg import "%%e" + echo mounting: %%~nr + reg load HKLM\OPUS-NT_TMP "%%r" + echo. + echo running tweaks for %%~nr... + for /d %%t in (%tweakdir%\*) do ( + call "applyTweakReg.bat" "%%t" "%%r" ) - echo unmounting: %%i - reg unload HKLM\FWIN_TMP + echo unmounting: %%r + reg unload HKLM\OPUS-NT_TMP ) -cd /d %workdir% - :: why would the default user settings not be in %windir%\system32\config? echo. -echo mounting: tmp\wim\users\default\ntuser.dat -reg load HKLM\FWIN_TMP "tmp\wim\Users\Default\NTUSER.DAT" +echo mounting: tmp\wim\Users\Default\NTUSER.DAT +reg load HKLM\OPUS-NT_TMP "tmp\wim\Users\Default\NTUSER.DAT" echo running tweaks for NTUSER... -for %%e in (%workdir%\opus-files\reg\NTUSER\*) do ( - echo applying: %%e - reg import "%%e" +for /d %%t in (%tweakdir%\*) do ( + call "applyTweakReg.bat" "%%t" "NTUSER" ) -echo unmounting: tmp\wim\users\default\ntuser.dat -reg unload HKLM\FWIN_TMP +echo unmounting: tmp\wim\Users\Default\NTUSER.DAT +reg unload HKLM\OPUS-NT_TMP echo. -echo applying scripts... -for /d %%i in (opus-files\scripts\*) do ( - echo applying: %%i - call "%%i\script.bat" +echo. +echo -- applying scripts -- +for /d %%t in (%tweakdir%\*) do ( + call "applyTweakScript.bat" %%t ) echo. -echo committing changes to wim and unmounting... +echo. +echo -- committing changes to wim and unmounting -- dism /unmount-image /mountdir:"tmp\wim" /commit echo. -echo applying files to disc-image... -for /d %%i in (opus-files\iso\*) do ( - echo applying: %%i - xcopy "%%i" "tmp\disc-image" /e /y +echo. +echo -- applying files to disc-image -- +for /d %%t in (%tweakdir%\*) do ( + call "applyTweakIso.bat" %%t ) echo. -echo moving disc-image folder... +echo -- moving disc-image folder -- rmdir "disc-image" /s /q move "tmp\disc-image" "%cd%" echo. -echo deleting tmp... +echo -- deleting tmp -- rmdir "tmp" /s /q echo. echo all done. a folder with the disc image's data has been created. use something like ntlite to compile it into an iso. pause explorer.exe "%cd%\disc-image" +goto exit :exit \ No newline at end of file diff --git a/opus-files/reg/SOFTWARE/delay feature updates.reg b/tweaks/delay feature updates/reg/SOFTWARE/delay feature updates.reg similarity index 79% rename from opus-files/reg/SOFTWARE/delay feature updates.reg rename to tweaks/delay feature updates/reg/SOFTWARE/delay feature updates.reg index 9e0d3f5..7ceecbd 100644 --- a/opus-files/reg/SOFTWARE/delay feature updates.reg +++ b/tweaks/delay feature updates/reg/SOFTWARE/delay feature updates.reg @@ -1,7 +1,7 @@ Windows Registry Editor Version 5.00 ; this sets the update channel to semi-annual, and additionally defers the updates for half a year -[HKEY_LOCAL_MACHINE\FWIN_TMP\Microsoft\WindowsUpdate\UX\Settings] +[HKEY_LOCAL_MACHINE\OPUS-NT_TMP\Microsoft\WindowsUpdate\UX\Settings] "BranchReadinessLevel"=dword:00000020 "DeferFeatureUpdates"=dword:00000001 "DeferFeatureUpdatesPeriodInDays"=dword:000000b7 diff --git a/opus-files/reg/SOFTWARE/disable activity history.reg b/tweaks/disable activity history/reg/SOFTWARE/disable activity history.reg similarity index 74% rename from opus-files/reg/SOFTWARE/disable activity history.reg rename to tweaks/disable activity history/reg/SOFTWARE/disable activity history.reg index b2fc925..d89e97e 100644 --- a/opus-files/reg/SOFTWARE/disable activity history.reg +++ b/tweaks/disable activity history/reg/SOFTWARE/disable activity history.reg @@ -1,6 +1,6 @@ Windows Registry Editor Version 5.00 -[HKEY_LOCAL_MACHINE\FWIN_TMP\Policies\Microsoft\Windows\System] +[HKEY_LOCAL_MACHINE\OPUS-NT_TMP\Policies\Microsoft\Windows\System] "AllowCrossDeviceClipboard"=dword:00000000 "EnableActivityFeed"=dword:00000000 "PublishUserActivities"=dword:00000000 diff --git a/opus-files/reg/NTUSER/no ads.reg b/tweaks/disable ads/reg/NTUSER/disable ads.reg similarity index 64% rename from opus-files/reg/NTUSER/no ads.reg rename to tweaks/disable ads/reg/NTUSER/disable ads.reg index 73ccc31..6b6280d 100644 --- a/opus-files/reg/NTUSER/no ads.reg +++ b/tweaks/disable ads/reg/NTUSER/disable ads.reg @@ -1,9 +1,9 @@ Windows Registry Editor Version 5.00 -[HKEY_LOCAL_MACHINE\FWIN_TMP\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced] +[HKEY_LOCAL_MACHINE\OPUS-NT_TMP\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced] "ShowSyncProviderNotifications"=dword:00000000 ; no explorer "suggestions" -[HKEY_LOCAL_MACHINE\FWIN_TMP\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager] +[HKEY_LOCAL_MACHINE\OPUS-NT_TMP\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager] "SystemPaneSuggestionsEnabled"=dword:00000000 ; no start menu "suggestions" "SoftLandingEnabled"=dword:00000000 ; no "tips", "tricks" and "suggestions" "SubscribedContent-338393Enabled"=dword:00000000 ; no settings "suggestions" diff --git a/tweaks/disable cortana/reg/SOFTWARE/disable cortana.reg b/tweaks/disable cortana/reg/SOFTWARE/disable cortana.reg new file mode 100644 index 0000000..68af9cf --- /dev/null +++ b/tweaks/disable cortana/reg/SOFTWARE/disable cortana.reg @@ -0,0 +1,5 @@ +Windows Registry Editor Version 5.00 + +[HKEY_LOCAL_MACHINE\OPUS-NT_TMP\Policies\Microsoft\Windows\Windows Search] +"AllowCortana"=dword:00000000 + diff --git a/tweaks/disable cross-pc update/SOFTWARE/disable cross-pc update.reg b/tweaks/disable cross-pc update/SOFTWARE/disable cross-pc update.reg new file mode 100644 index 0000000..8c5d175 --- /dev/null +++ b/tweaks/disable cross-pc update/SOFTWARE/disable cross-pc update.reg @@ -0,0 +1,5 @@ +Windows Registry Editor Version 5.00 + +[HKEY_LOCAL_MACHINE\OPUS-NT_TMP\Microsoft\Windows\CurrentVersion\DeliveryOptimization\Config] +"DODownloadMode"=dword:00000000 + diff --git a/opus-files/reg/SOFTWARE/disable driver updates.reg b/tweaks/disable driver updates/reg/SOFTWARE/disable driver updates.reg similarity index 55% rename from opus-files/reg/SOFTWARE/disable driver updates.reg rename to tweaks/disable driver updates/reg/SOFTWARE/disable driver updates.reg index 7681108..2e85f58 100644 Binary files a/opus-files/reg/SOFTWARE/disable driver updates.reg and b/tweaks/disable driver updates/reg/SOFTWARE/disable driver updates.reg differ diff --git a/opus-files/reg/SYSTEM/disable fast startup.reg b/tweaks/disable fast startup/reg/SYSTEM/disable fast startup.reg similarity index 50% rename from opus-files/reg/SYSTEM/disable fast startup.reg rename to tweaks/disable fast startup/reg/SYSTEM/disable fast startup.reg index feb31b0..5722dd9 100644 Binary files a/opus-files/reg/SYSTEM/disable fast startup.reg and b/tweaks/disable fast startup/reg/SYSTEM/disable fast startup.reg differ diff --git a/opus-files/reg/SYSTEM/disable hibernation.reg b/tweaks/disable hibernation/reg/SYSTEM/disable hibernation.reg similarity index 50% rename from opus-files/reg/SYSTEM/disable hibernation.reg rename to tweaks/disable hibernation/reg/SYSTEM/disable hibernation.reg index 900c9a6..f23b959 100644 Binary files a/opus-files/reg/SYSTEM/disable hibernation.reg and b/tweaks/disable hibernation/reg/SYSTEM/disable hibernation.reg differ diff --git a/tweaks/disable onedrive auto-install/reg/NTUSER/disable onedrive auto-install.reg b/tweaks/disable onedrive auto-install/reg/NTUSER/disable onedrive auto-install.reg new file mode 100644 index 0000000..0c38ac2 Binary files /dev/null and b/tweaks/disable onedrive auto-install/reg/NTUSER/disable onedrive auto-install.reg differ diff --git a/opus-files/reg/SYSTEM/disable superfetch.reg b/tweaks/disable superfetch/reg/SYSTEM/disable superfetch.reg similarity index 50% rename from opus-files/reg/SYSTEM/disable superfetch.reg rename to tweaks/disable superfetch/reg/SYSTEM/disable superfetch.reg index 6e24715..f020d33 100644 Binary files a/opus-files/reg/SYSTEM/disable superfetch.reg and b/tweaks/disable superfetch/reg/SYSTEM/disable superfetch.reg differ diff --git a/opus-files/reg/SOFTWARE/disable telemetry.reg b/tweaks/disable telemetry/reg/SOFTWARE/disable telemetry.reg similarity index 55% rename from opus-files/reg/SOFTWARE/disable telemetry.reg rename to tweaks/disable telemetry/reg/SOFTWARE/disable telemetry.reg index d5159c9..dcbdcec 100644 Binary files a/opus-files/reg/SOFTWARE/disable telemetry.reg and b/tweaks/disable telemetry/reg/SOFTWARE/disable telemetry.reg differ diff --git a/opus-files/reg/SOFTWARE/disable windows defender.reg b/tweaks/disable windows defender/reg/SOFTWARE/disable windows defender.reg similarity index 52% rename from opus-files/reg/SOFTWARE/disable windows defender.reg rename to tweaks/disable windows defender/reg/SOFTWARE/disable windows defender.reg index 65cf43b..593f32f 100644 --- a/opus-files/reg/SOFTWARE/disable windows defender.reg +++ b/tweaks/disable windows defender/reg/SOFTWARE/disable windows defender.reg @@ -1,5 +1,5 @@ Windows Registry Editor Version 5.00 -[HKEY_LOCAL_MACHINE\FWIN_TMP\Policies\Microsoft\Windows Defender] +[HKEY_LOCAL_MACHINE\OPUS-NT_TMP\Policies\Microsoft\Windows Defender] "DisableAntiSpyware"=dword:00000001 diff --git a/opus-files/reg/SYSTEM/disable windows search.reg b/tweaks/disable windows search/reg/SYSTEM/disable windows search.reg similarity index 50% rename from opus-files/reg/SYSTEM/disable windows search.reg rename to tweaks/disable windows search/reg/SYSTEM/disable windows search.reg index 181adc5..4718fab 100644 Binary files a/opus-files/reg/SYSTEM/disable windows search.reg and b/tweaks/disable windows search/reg/SYSTEM/disable windows search.reg differ diff --git a/opus-files/iso/partial unattended setup/autounattend.xml b/tweaks/partial unattended setup/iso/autounattend.xml similarity index 100% rename from opus-files/iso/partial unattended setup/autounattend.xml rename to tweaks/partial unattended setup/iso/autounattend.xml diff --git a/opus-files/reg/SOFTWARE/autorun post-setup scripts.reg b/tweaks/post-setup script - master/reg/SOFTWARE/autorun post-setup scripts.reg similarity index 63% rename from opus-files/reg/SOFTWARE/autorun post-setup scripts.reg rename to tweaks/post-setup script - master/reg/SOFTWARE/autorun post-setup scripts.reg index 94b659f..3fea174 100644 Binary files a/opus-files/reg/SOFTWARE/autorun post-setup scripts.reg and b/tweaks/post-setup script - master/reg/SOFTWARE/autorun post-setup scripts.reg differ diff --git a/opus-files/wim/SetupComplete master-script/opus-nt-setupcomplete/setupcomplete.bat b/tweaks/post-setup script - master/wim/opus-nt-setupcomplete/setupcomplete.bat similarity index 100% rename from opus-files/wim/SetupComplete master-script/opus-nt-setupcomplete/setupcomplete.bat rename to tweaks/post-setup script - master/wim/opus-nt-setupcomplete/setupcomplete.bat diff --git a/tweaks/show file extensions/reg/NTUSER/show file extensions.reg b/tweaks/show file extensions/reg/NTUSER/show file extensions.reg new file mode 100644 index 0000000..5ca0866 Binary files /dev/null and b/tweaks/show file extensions/reg/NTUSER/show file extensions.reg differ