temp!

roles/1password/tasks/Darwin.yaml

@@ -1,9 +1,5 @@
 ---
 - name: install homebrew package
   homebrew_cask:
-    name:
-      - 1password
-      - 1password-cli
+    name: 1password
     state: latest
-
-- include_tasks: zsh-completion.yaml

roles/1password/tasks/Debian.yaml

@@ -1,38 +1 @@
----
-- name: add apt signing key
-  become: true
-  apt_key:
-    url: https://downloads.1password.com/linux/keys/1password.asc
-    keyring: /etc/apt/trusted.gpg.d/1password-archive-keyring.gpg
-    state: present
-
-- when: ansible_machine == 'x86_64'
-  set_fact:
-    arch: amd64
-
-- assert:
-    that: arch is defined
-    fail_msg: 'Architecture not currently supported: {{ansible_machine}}'
-
-- name: add apt repository
-  become: true
-  apt_repository:
-    repo: >-
-      deb [arch={{arch}}
-      signed-by=/etc/apt/trusted.gpg.d/1password-archive-keyring.gpg]
-      https://downloads.1password.com/linux/debian/{{arch}} stable main
-
-- name: install gui package
-  when: '"WSL" not in ansible_kernel'
-  become: true
-  apt:
-    name: 1password
-    state: latest
-
-- name: install cli package
-  become: true
-  apt:
-    name: 1password-cli
-    state: latest
-
-- include_tasks: zsh-completion.yaml
+# TODO: https://support.1password.com/install-linux/#debian-or-ubuntu

roles/1password/tasks/Windows.yaml

@@ -1,107 +1,12 @@
 ---
-# NOTE: The 1Password chocolatey packages are not up to date.
-
-# GUI
-- set_fact:
-    app_exe: '{{ansible_env.LOCALAPPDATA}}/1Password/app/8/1Password.exe'
-    installer_exe: '{{ansible_env.TEMP}}/1PasswordSetup-latest.exe'
-
-- name: check if already installed
-  win_stat:
-    path: '{{app_exe}}'
-  register: app_stat
-
-- name: get installed version
-  when: app_stat.stat.exists == True
-  win_command: '{{app_exe}} --version'
-  register: app_version
-  changed_when: false
-
-- when: app_stat.stat.exists == True
-  set_fact:
-    installed_version: '{{app_version.stdout.strip()}}'
-
-- name: download latest installer
-  win_get_url:
-    url: https://downloads.1password.com/win/1PasswordSetup-latest.exe
-    dest: '{{installer_exe}}'
-
-- name: get installer version
-  win_shell: |
-    (Get-ItemProperty {{installer_exe}}).VersionInfo.ProductVersion
-  register: installer_product_version
-  changed_when: false
-
-# FIXME: The [5:] is to account for a mystery "\e[6 q" prefix, not sure if this
-# is consistent across machines or some other oddity.
-- set_fact:
-    installer_version: '{{installer_product_version.stdout.strip()[5:]}}'
-
-- name: run installer
-  when: installed_version is not defined or installed_version != installer_version
-  win_command: '{{installer_exe}}'
+- name: install chocolatey package
+  win_chocolatey:
+    name:
+      - 1password
+    state: latest
 
 - name: create start menu shortcut
   win_shortcut:
-    src: '{{app_exe}}'
+    src: '{{ansible_env.LOCALAPPDATA}}/1Password/app/7/1Password.exe'
     dest: '{{ansible_env.ProgramData}}/Microsoft/Windows/Start Menu/Programs/1Password.lnk'
-    icon: '{{app_exe}},0'
-
-# CLI
-- set_fact:
-    cli_dir: '{{ansible_env.LOCALAPPDATA}}\1Password\cli'
-    cli_zip: '{{ansible_env.TEMP}}/op_windows_amd64.zip'
-- set_fact:
-    cli_exe: '{{cli_dir}}\op.exe'
-
-- name: check if op already installed
-  win_stat:
-    path: '{{cli_exe}}'
-  register: cli_stat
-
-- name: get installed op version
-  when: cli_stat.stat.exists == True
-  win_command: '{{cli_exe}} --version'
-  register: cli_version
-  changed_when: false
-
-- when: cli_stat.stat.exists == True
-  set_fact:
-    cli_installed_version: '{{cli_version.stdout.strip()}}'
-
-- name: get list of op releases
-  win_uri:
-    url: https://raw.githubusercontent.com/kbenzie/op-release-scraper/main/op-releases.json
-    return_content: true
-  register: releases
-
-- set_fact:
-    latest: '{{releases.json[0]}}'
-
-- name: download latest op zip archive
-  when: cli_installed_version is not defined or cli_installed_version != latest.version
-  win_get_url:
-    url: '{{latest.downloads.Windows.amd64}}'
-    dest: '{{cli_zip}}'
-
-- name: unzip op zip archive
-  when: cli_installed_version is not defined or cli_installed_version != latest.version
-  win_unzip:
-    src: '{{cli_zip}}'
-    dest: '{{cli_dir}}'
-
-- name: add op install directory to user PATH
-  win_path:
-    scope: user
-    name: Path
-    elements: '{{cli_dir}}'
-
-- name: get op powershell completion script
-  win_command: op completion powershell
-  register: powershell_completion_script
-  changed_when: false
-
-- name: create op powershell completion file
-  win_copy:
-    content: '{{powershell_completion_script.stdout}}'
-    dest: '{{cli_dir}}/opProfile.psm1'
+    icon: '{{ansible_env.LOCALAPPDATA}}/1Password/app/7/1Password.exe,0'

roles/1password/tasks/zsh-completion.yaml

@@ -1,10 +0,0 @@
----
-- name: get op zsh completion script
-  command: op completion zsh
-  register: zsh_completion_script
-  changed_when: false
-
-- name: create op zsh completion file
-  copy:
-    content: '{{zsh_completion_script.stdout}}'
-    dest: ~/.local/share/zsh/site-functions/_op

roles/op/tasks/Darwin.yaml

@@ -0,0 +1,5 @@
+---
+- name: install homebrew package
+  homebrew_cask:
+    name: 1password-cli
+    state: latest

roles/op/tasks/Debian.yaml

@@ -0,0 +1,38 @@
+---
+- name: get html of latest versions
+  uri:
+    url: https://raw.githubusercontent.com/kbenzie/op-release-scraper/main/op-releases.json
+  register: op_releases
+
+- when: ansible_machine == "x86"
+  set_fact: {op_arch: '386'}
+- when: ansible_machine == "x86_64"
+  set_fact: {op_arch: 'amd64'}
+- when: ansible_machine == "arm"
+  set_fact: {op_arch: 'arm'}
+- when: ansible_machine == "arm64"
+  set_fact: {op_arch: 'arm64'}
+
+- set_fact:
+    op_zip_url: '{{op_releases.json[0].downloads.Linux[op_arch]}}'
+
+- name: create directory for downloaded package
+  file:
+    state: directory
+    dest: ~/.local/src/op
+
+- name: download latest release package
+  get_url:
+    url: '{{op_zip_url}}'
+    dest: ~/.local/src/op/op.zip
+
+- name: extract zip package
+  unarchive:
+    src: ~/.local/src/op/op.zip
+    dest: ~/.local/src/op
+
+- name: create symbolic links
+  file:
+    src: ~/.local/src/op/op
+    dest: ~/.local/bin/op
+    state: link

roles/op/tasks/Windows.yaml

@@ -0,0 +1,5 @@
+---
+- name: install chocolatey package
+  win_chocolatey:
+    name: op
+    state: latest

roles/op/tasks/main.yaml

@@ -0,0 +1,2 @@
+---
+- include_tasks: '{{ansible_os_family}}.yaml'

roles/system-info/tasks/Debian.yaml

@@ -1,25 +1,5 @@
 ---
-- name: install apt packages
-  become: true
-  apt:
-    name:
-      - gawk
-      - sysstat
-    state: latest
-
-- name: create systemd user unit directory
-  file:
-    state: directory
-    dest: ~/.config/systemd/user
-
-- name: install system-info systemd unit
-  copy:
-    src: ~/.config/tmux/system-info/system-info.service
-    dest: ~/.config/systemd/user/system-info.service
-
-- name: enable system-info service
-  systemd:
-    name: system-info
-    scope: user
-    enabled: true
-    state: started
+# TODO:
+# cp $script_dir/system-info.service ~/.config/systemd/user/system-info.service
+# systemctl --user enable system-info
+# systemctl --user start system-info

roles/webcatalog/tasks/Darwin.yaml

@@ -0,0 +1,3 @@
+---
+- set_fact:
+    download_url: https://cdn-2.webcatalog.io/webcatalog/WebCatalog-{{latest.version}}-universal.dmg

roles/webcatalog/tasks/Debian.yaml

@@ -0,0 +1,31 @@
+---
+- assert: {that: [ansible_machine == 'x86_64']}
+
+- set_fact:
+    filename: 'WebCatalog-{{latest.version}}.AppImage'
+# TODO: Support arm64: 'WebCatalog-{{latest.version}}-arm64.AppImage'
+
+- name: create directory for download
+  file:
+    state: directory
+    dest: ~/.local/src/webcatalog
+
+- name: download AppImage
+  get_url:
+    url: 'https://cdn-2.webcatalog.io/webcatalog/{{filename}}'
+    dest: '~/.local/src/webcatalog/{{filename}}'
+
+- name: make AppImage executable
+  file:
+    dest: '~/.local/src/webcatalog/{{filename}}'
+    mode: a+x
+
+- name: create symbolic link
+  file:
+    src: '~/.local/src/webcatalog/{{filename}}'
+    dest: '~/.local/bin/WebCatalog'
+    state: link
+
+- name: create desktop file
+  template:
+    dest: io.webcatalog.WebCatalog.desktop

roles/webcatalog/tasks/Windows.yaml

@@ -0,0 +1,5 @@
+---
+- set_fact:
+    filename: WebCatalog%20Setup%20{{latest.version}}.exe
+
+- name: download 

roles/webcatalog/tasks/main.yaml

@@ -0,0 +1,19 @@
+---
+- name: get latest releases
+  uri:
+    url: https://raw.githubusercontent.com/kbenzie/webcatalog-release-scraper/main/webcatalog-releases.json
+  register: releases
+
+- set_fact:
+    latest: '{{releases.json[0]}}'
+
+- include_tasks: '{{ansible_os_family}}.yaml'
+
+# TODO: Generate these links from the changelog from 42.0.0 up
+
+- debug: msg=https://cdn-2.webcatalog.io/webcatalog/WebCatalog-{{latest.version}}-universal.dmg
+- debug: msg=https://cdn-2.webcatalog.io/webcatalog/WebCatalog%20Setup%20{{latest.version}}.exe
+- debug: msg=https://cdn-2.webcatalog.io/webcatalog/WebCatalog-{{latest.version}}.AppImage
+- debug: msg=https://cdn-2.webcatalog.io/webcatalog/WebCatalog-{{latest.version}}-arm64.AppImage
+
+# NOTE: Otherwise use https://github.com/webcatalog/webcatalog-legacy/releases

roles/webcatalog/templates/webcatalog.desktop.j2

@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=WebCatalog
+Exec={{command}}
+Terminal=false
+Type=Application
+Icon=webcatalog
+StartupWMClass=WebCatalog
+X-AppImage-Version={{latest.version}}
+Comment=Turn Any Websites Into Real Desktop Apps
+MimeType=x-scheme-handler/webcatalog;
+Categories=Utility;