fmt: ansible-lint fix validated schema var

guitarrapc · May 9, 2023 · 12aa7ad · 12aa7ad
1 parent 96ca456
commit 12aa7ad
Show file tree

Hide file tree

Showing 3 changed files with 144 additions and 70 deletions.
diff --git a/envs/macos/roles/defaults/tasks/main.yml b/envs/macos/roles/defaults/tasks/main.yml
@@ -4,7 +4,7 @@
     key: "{{ item.key }}"
     type: "{{ item.type }}"
     value: "{{ item.value }}"
-    state: "{{ item.state | default('present') }}"
+    state: "{{ item.state }}"
   with_items: "{{ interface_settings }}"
 
 - name: "Set Screen Defaults"
@@ -13,7 +13,7 @@
     key: "{{ item.key }}"
     type: "{{ item.type }}"
     value: "{{ item.value }}"
-    state: "{{ item.state | default('present') }}"
+    state: "{{ item.state }}"
   with_items: "{{ screen_settings }}"
 
 - name: "Set Trackpad Defaults"
@@ -22,7 +22,7 @@
     key: "{{ item.key }}"
     type: "{{ item.type }}"
     value: "{{ item.value }}"
-    state: "{{ item.state | default('present') }}"
+    state: "{{ item.state }}"
   with_items: "{{ trackpad_settings }}"
 
 - name: "Set Finder Defaults"
@@ -31,7 +31,7 @@
     key: "{{ item.key }}"
     type: "{{ item.type }}"
     value: "{{ item.value }}"
-    state: "{{ item.state | default('present') }}"
+    state: "{{ item.state }}"
   with_items: "{{ finder_settings }}"
 
 - name: "Set Dock Defaults"
@@ -40,5 +40,5 @@
     key: "{{ item.key }}"
     type: "{{ item.type }}"
     value: "{{ item.value }}"
-    state: "{{ item.state | default('present') }}"
+    state: "{{ item.state }}"
   with_items: "{{ dock_settings }}"
diff --git a/envs/macos/roles/defaults/vars/main.yml b/envs/macos/roles/defaults/vars/main.yml
@@ -6,13 +6,15 @@ interface_settings:
       key: AppleInterfaceStyle,
       type: string,
       value: Dark,
+      state: present,
     }
   # Mojave whole Dark Theme (remove value if you want to reset)
   - {
       domain: "Apple Global Domain",
       key: AppleInterfaceStyle,
       type: string,
       value: Dark,
+      state: present,
     }
 
 # screen
@@ -23,12 +25,14 @@ screen_settings:
       key: askForPasswordDelay,
       type: int,
       value: 0,
+      state: present,
     }
   - {
       domain: com.apple.screencapture,
       key: disable-shadow,
       type: bool,
       value: true,
+      state: present,
     }
 
 # trackpad
@@ -39,6 +43,7 @@ trackpad_settings:
       key: com.apple.swipescrolldirection,
       type: int,
       value: 0,
+      state: present,
     }
 
 # finder
@@ -48,50 +53,81 @@ finder_settings:
       key: AppleShowAllExtensions,
       type: bool,
       value: true,
+      state: present,
+    }
+  - {
+      domain: com.apple.finder,
+      key: FinderSounds,
+      type: bool,
+      value: false,
+      state: present,
     }
-  - { domain: com.apple.finder, key: FinderSounds, type: bool, value: false }
   - {
       domain: com.apple.finder,
       key: ShowExternalHardDrivesOnDesktop,
       type: bool,
       value: true,
+      state: present,
+    }
+  - {
+      domain: com.apple.finder,
+      key: ShowStatusBar,
+      type: bool,
+      value: true,
+      state: present,
+    }
+  - {
+      domain: com.apple.finder,
+      key: ShowTabView,
+      type: bool,
+      value: true,
+      state: present,
+    }
+  - {
+      domain: com.apple.finder,
+      key: ShowPathbar,
+      type: bool,
+      value: true,
+      state: present,
     }
-  - { domain: com.apple.finder, key: ShowStatusBar, type: bool, value: true }
-  - { domain: com.apple.finder, key: ShowTabView, type: bool, value: true }
-  - { domain: com.apple.finder, key: ShowPathbar, type: bool, value: true }
   # keep folder top on sort
   - {
       domain: com.apple.finder,
       key: _FXSortFoldersFirst,
       type: bool,
       value: true,
+      state: present,
     }
   # search the current folder by default
   - {
       domain: com.apple.finder,
       key: FXDefaultSearchScope,
       type: string,
       value: SCcf,
+      state: present,
     }
   # no worning on change extentions
   - {
       domain: com.apple.finder,
       key: FXEnableExtensionChangeWarning,
       type: bool,
       value: false,
+      state: present,
     }
   # Avoid creating .DS_Store files on network or USB volumes
   - {
       domain: com.apple.desktopservices,
       key: DSDontWriteNetworkStores,
       type: bool,
       value: true,
+      state: present,
     }
   - {
       domain: com.apple.desktopservices,
       key: DSDontWriteUSBStores,
       type: bool,
       value: true,
+      state: present,
     }
   # Use list view in all Finder windows by default
   # Four-letter codes for the other view modes: `icnv`, `clmv`, `Flwv`
@@ -100,6 +136,7 @@ finder_settings:
       key: FXPreferredViewStyle,
       type: string,
       value: Nlsv,
+      state: present,
     }
 
 # dock
@@ -110,16 +147,24 @@ dock_settings:
       key: minimize-to-application,
       type: bool,
       value: true,
+      state: present,
     }
   # Show indicator lights for open applications in the Dock
   - {
       domain: com.apple.dock,
       key: show-process-indicators,
       type: bool,
       value: true,
+      state: present,
     }
   # Automatically hide and show the Dock
-  - { domain: com.apple.dock, key: autohide, type: bool, value: false }
+  - {
+      domain: com.apple.dock,
+      key: autohide,
+      type: bool,
+      value: false,
+      state: present,
+    }
 
     # Hot corners
     # Possible values:
@@ -138,37 +183,44 @@ dock_settings:
 #       domain: com.apple.dock,
 #       key: wvous-tl-corner,
 #       type: int,
-#       value: 2
+#       value: 2,
+#       state: present,
+
 #   }
 #   - {
 #       domain: com.apple.dock,
 #       key: wvous-tl-modifier,
 #       type: int,
-#       value: 0
+#       value: 0,
+#       state: present,
 #   }
 #   # Top right screen corner → Desktop
 #   - {
 #       domain: com.apple.dock,
 #       key: wvous-tr-corner,
 #       type: int,
-#       value: 4
+#       value: 4,
+#       state: present,
 #   }
 #   - {
 #       domain: com.apple.dock,
 #       key: wvous-tr-modifier,
 #       type: int,
-#       value: 0
+#       value: 0,
+#       state: present,
 #   }
 # Bottom left screen corner → Start screen saver
 #   - {
 #       domain: com.apple.dock,
 #       key: wvous-bl-corner,
 #       type: int,
-#       value: 5
+#       value: 5,
+#       state: present,
 #   }
 #   - {
 #       domain: com.apple.dock,
 #       key: wvous-bl-modifier,
 #       type: int,
-#       value: 0
+#       value: 0,
+#       state: present,
 #   }