From ac5298d7fcf907d6992f313747c50682a5aae99c Mon Sep 17 00:00:00 2001
From: he3als <65787561+he3als@users.noreply.github.com>
Date: Sat, 21 Oct 2023 08:04:25 +0100
Subject: [PATCH] feat: move options to tasks

---
 .../tweaks/misc/restore-default-sleep-timeout.yml            | 5 +++--
 .../Configuration/tweaks/scripts/script-core-isolation.yml   | 2 +-
 .../tweaks/scripts/script-file-associations.yml              | 1 +
 .../Configuration/tweaks/scripts/script-mitigations.yml      | 3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/playbook/Configuration/tweaks/misc/restore-default-sleep-timeout.yml b/src/playbook/Configuration/tweaks/misc/restore-default-sleep-timeout.yml
index 9641cbbff0..637b9201b4 100644
--- a/src/playbook/Configuration/tweaks/misc/restore-default-sleep-timeout.yml
+++ b/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'}
diff --git a/src/playbook/Configuration/tweaks/scripts/script-core-isolation.yml b/src/playbook/Configuration/tweaks/scripts/script-core-isolation.yml
index 60e4abfde0..4eb3a4c0da 100644
--- a/src/playbook/Configuration/tweaks/scripts/script-core-isolation.yml
+++ b/src/playbook/Configuration/tweaks/scripts/script-core-isolation.yml
@@ -2,10 +2,10 @@
 title: Disable Core Isolation
 description: Disables Core Isolation (VBS) based on the user's options
 privilege: TrustedInstaller
+option: 'vbs-disable'
 actions:
   - !run:
     exe: 'powershell.exe'
     args: '-NoP -File "$env:windir\AtlasDesktop\7. Security\Core Isolation (VBS)\Current Configuration.ps1" -DisableAllVBS'
     exeDir: true
     wait: true
-    option: 'vbs-disable'
\ No newline at end of file
diff --git a/src/playbook/Configuration/tweaks/scripts/script-file-associations.yml b/src/playbook/Configuration/tweaks/scripts/script-file-associations.yml
index 76bdd90c1f..5fc7db39c5 100644
--- a/src/playbook/Configuration/tweaks/scripts/script-file-associations.yml
+++ b/src/playbook/Configuration/tweaks/scripts/script-file-associations.yml
@@ -7,6 +7,7 @@ actions:
     exe: 'FILEASSOC.cmd'
     exeDir: true
     wait: true
+    option: '!uninstall-edge'
   - !run:
     exe: 'FILEASSOC.cmd'
     args: '"Brave"'
diff --git a/src/playbook/Configuration/tweaks/scripts/script-mitigations.yml b/src/playbook/Configuration/tweaks/scripts/script-mitigations.yml
index ca6ed3053e..b1f82170b5 100644
--- a/src/playbook/Configuration/tweaks/scripts/script-mitigations.yml
+++ b/src/playbook/Configuration/tweaks/scripts/script-mitigations.yml
@@ -2,10 +2,11 @@
 title: Disable Mitigations
 description: Disables mitigations in Windows dependant on the user's options
 privilege: TrustedInstaller
+option: 'mitigations-disable'
 actions:
   - !run:
     exe: 'Disable All Mitigations.cmd'
     path: '%windir%\AtlasDesktop\7. Security\Mitigations'
     args: '/silent'
     wait: true
-    option: 'mitigations-disable'
+