Fix playbook imports

UnixGUI.yaml

@@ -1,6 +1,5 @@
 ---
 - import_playbook: UnixCLI.yaml
-
 - hosts: localhost
   roles:
     - role: 1password

macOS.yaml

@@ -1,7 +1,5 @@
 ---
-- import_playbook: Unix.yaml
-
+- import_playbook: UnixGUI.yaml
 - hosts: localhost
-
   roles:
     - role: obsidian

roles/jp/tasks/Darwin.yaml

@@ -4,9 +4,12 @@
     url: https://api.github.com/repos/jmespath/jp/releases/latest
   register: latest
 
-# TODO: Support arm64
 - set_fact:
-    asset_query: '[?contains(name, `jp-darwin-amd64`)] | [0]'
+    arch: '{{ [ansible_architecture] |
+      map("extract", { "arm64": "arm64", "x86_64": "amd64" }) | first }}'
+
+- set_fact:
+    asset_query: '[?contains(name, `jp-darwin-{{arch}}`)] | [0]'
     assets: '{{latest.json.assets}}'
     latest_version: '{{latest.json.tag_name}}'
     jp_exe: '{{ansible_env.HOME}}/.local/bin/jp'

roles/obsidian/tasks/Darwin.yaml

@@ -1,6 +1,6 @@
 ---
 - name: install homebrew package
-  homebrew:
+  homebrew_cask:
     name: obsidian
     state: latest
 
@@ -8,4 +8,4 @@
   git:
     repo: git@github.com:kbenzie/notes.git
     dest: '{{ansible_env.HOME}}/Documents/Notes'
-    branch: main
+    version: main