Updated setup.py

.bin/Scripts/functions/setup.py

@@ -1,8 +1,11 @@
 # Wizard Kit: Functions - Setup
 
 from functions.common import *
+from functions.update import *
 
 # STATIC VARIABLES
+HKU =  winreg.HKEY_USERS
+HKCR = winreg.HKEY_CLASSES_ROOT
 HKCU = winreg.HKEY_CURRENT_USER
 HKLM = winreg.HKEY_LOCAL_MACHINE
 MOZILLA_FIREFOX_UBO_PATH = r'{}\{}\ublock_origin.xpi'.format(
@@ -29,15 +32,22 @@ SETTINGS_CLASSIC_START = {
         },
     }
 SETTINGS_EXPLORER_SYSTEM = {
+    # Disable Location Tracking
+    r'Software\Microsoft\Windows NT\CurrentVersion\Sensor\Overrides\{BFA794E4-F964-4FDB-90F6-51056BFE4B44}': {
+        'DWORD Items': {'SensorPermissionState': 0},
+        },
+    r'System\CurrentControlSet\Services\lfsvc\Service\Configuration': {
+        'Status': {'Value': 0},
+        },
     # Disable Telemetry
-    r'SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection': {
+    r'Software\Microsoft\Windows\CurrentVersion\Policies\DataCollection': {
         'DWORD Items': {'AllowTelemetry': 0},
         },
-    r'SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection': {
+    r'Software\Microsoft\Windows\CurrentVersion\Policies\DataCollection': {
         'DWORD Items': {'AllowTelemetry': 0},
         'WOW64_32': True,
         },
-    r'SOFTWARE\Policies\Microsoft\Windows\DataCollection': {
+    r'Software\Policies\Microsoft\Windows\DataCollection': {
         'DWORD Items': {'AllowTelemetry': 0},
         },
     # Disable Wi-Fi Sense
@@ -47,27 +57,19 @@ SETTINGS_EXPLORER_SYSTEM = {
     r'Software\Microsoft\PolicyManager\default\WiFi\AllowAutoConnectToWiFiSenseHotspots': {
         'DWORD Items': {'Value': 0},
         },
-    # Disable Location Tracking
-    r'SOFTWARE\Microsoft\Windows NT\CurrentVersion\Sensor\Overrides\{BFA794E4-F964-4FDB-90F6-51056BFE4B44}': {
-        'DWORD Items': {'SensorPermissionState': 0},
-        },
-    r'System\CurrentControlSet\Services\lfsvc\Service\Configuration': {
-        'Status': {'Value': 0},
-        },
     }
 SETTINGS_EXPLORER_USER = {
-    # Disable Cortana
+    # Disable silently installed apps
-    r'Software\Microsoft\Personalization\Settings': {
+    r'Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager': {
-        'DWORD Items': {'AcceptedPrivacyPolicy': 0},
+        'DWORD Items': {'SilentInstalledAppsEnabled': 0},
         },
-    r'Software\Microsoft\InputPersonalization': {
+    # Disable Tips and Tricks
-        'DWORD Items': {
+    r'Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager': {
-            'RestrictImplicitTextCollection': 1,
+        'DWORD Items': {'SoftLandingEnabled ': 0},
-            'RestrictImplicitInkCollection': 1
-            },
         },
-    r'Software\Microsoft\InputPersonalization\TrainedDataStore': {
+    # Hide People bar
-        'DWORD Items': {'HarvestContacts': 1},
+    r'Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced\People': {
+        'DWORD Items': {'PeopleBand': 0},
         },
     # Hide Search button / box
     r'Software\Microsoft\Windows\CurrentVersion\Search': {
@@ -178,25 +180,6 @@ def config_classicstart():
     sleep(1)
     popen_program(cs_exe)
 
-def write_registry_settings(settings, all_users=False):
-    """Write registry values from custom dict of dicts."""
-    hive = HKCU
-    if all_users:
-        hive = HKLM
-    for k, v in settings.items():
-        # CreateKey
-        access = winreg.KEY_WRITE
-        if 'WOW64_32' in v:
-            access = access | winreg.KEY_WOW64_32KEY
-        winreg.CreateKeyEx(hive, k, 0, access)
-        
-        # Create values
-        with winreg.OpenKeyEx(hive, k, 0, access) as key:
-            for name, value in v.get('DWORD Items', {}).items():
-                winreg.SetValueEx(key, name, 0, winreg.REG_DWORD, value)
-            for name, value in v.get('SZ Items', {}).items():
-                winreg.SetValueEx(key, name, 0, winreg.REG_SZ, value)
-
 def config_explorer_system():
     """Configure Windows Explorer for all users via Registry settings."""
     write_registry_settings(SETTINGS_EXPLORER_SYSTEM, all_users=True)
@@ -205,6 +188,15 @@ def config_explorer_user():
     """Configure Windows Explorer for current user via Registry settings."""
     write_registry_settings(SETTINGS_EXPLORER_USER, all_users=False)
 
+def disable_windows_telemetry():
+    """Disable Windows 10 telemetry settings with O&O ShutUp10."""
+    extract_item('ShutUp10', silent=True)
+    cmd = [
+        r'{BinDir}\ShutUp10\OOSU10.exe'.format(**global_vars),
+        r'{BinDir}\ShutUp10\1201.cfg'.format(**global_vars),
+        '/quiet']
+    run_program(cmd)
+
 def update_clock():
     """Set Timezone and sync clock."""
     run_program(['tzutil' ,'/s', WINDOWS_TIME_ZONE], check=False)
@@ -217,6 +209,25 @@ def update_clock():
     run_program(['net', 'start', 'w32ime'], check=False)
     run_program(['w32tm', '/resync', '/nowait'], check=False)
 
+def write_registry_settings(settings, all_users=False):
+    """Write registry values from custom dict of dicts."""
+    hive = HKCU
+    if all_users:
+        hive = HKLM
+    for k, v in settings.items():
+        # CreateKey
+        access = winreg.KEY_WRITE
+        if 'WOW64_32' in v:
+            access = access | winreg.KEY_WOW64_32KEY
+        winreg.CreateKeyEx(hive, k, 0, access)
+
+        # Create values
+        with winreg.OpenKeyEx(hive, k, 0, access) as key:
+            for name, value in v.get('DWORD Items', {}).items():
+                winreg.SetValueEx(key, name, 0, winreg.REG_DWORD, value)
+            for name, value in v.get('SZ Items', {}).items():
+                winreg.SetValueEx(key, name, 0, winreg.REG_SZ, value)
+
 # Installations
 def install_adobe_reader():
     """Install Adobe Reader."""
@@ -257,7 +268,7 @@ def install_firefox_extensions():
     # Update registry
     write_registry_settings(SETTINGS_MOZILLA_FIREFOX_32, all_users=True)
     write_registry_settings(SETTINGS_MOZILLA_FIREFOX_64, all_users=True)
-    
+
     # Extract extension(s) to distribution folder
     cmd = [
         global_vars['Tools']['SevenZip'], 'e', '-aos', '-bso0', '-bse0',