temp!

Unix.yaml

@@ -2,33 +2,21 @@
 - hosts: localhost
 
   roles:
-    - role: sudo
-      when: ansible_user_id != "root"
-
     - role: zsh
     - role: neovim
     - role: tmux
     - role: system-info
-      when: '"WSL" not in ansible_kernel'
 
     - role: ag
     - role: bat
-    - role: curl
     - role: fzf
     - role: git
-    - role: htop
+    - role: op
-    - role: jp
-    - role: jq
-    - role: readline
-    - role: tidy
     - role: tree
-    - role: yq
 
     - role: llvm
     - role: nodejs
     - role: python
 
-    - role: 1password
-
     - role: wsl
       when: '"WSL" in ansible_kernel'

Windows.yaml

@@ -1,22 +1,16 @@
 ---
 - hosts: windows
 
-  vars:
-    install_cad_apps: false
-
   roles:
-    - role: git
     - role: powershell
     - role: neovim
     - role: system-info
 
     - role: ag
-    - role: bat
-    - role: curl
     - role: fzf
+    - role: git
+    - role: op
     - role: tree
-    - role: jq
-    - role: yq
 
     - role: llvm
     - role: nodejs
@@ -26,10 +20,4 @@
     - role: autohotkey
     - role: firefox
     - role: obsidian
-    - role: powertoys
     - role: windows-terminal
-
-    - role: autodesk-fusion360
-      when: install_cad_apps
-    - role: prusaslicer
-      when: install_cad_apps

macOS.yaml

@@ -1,5 +1,5 @@
 ---
-- import_playbook: Unix.yaml
+- import_playbook: unix.yaml
 
 - hosts: localhost
 

roles/1password/tasks/Darwin.yaml

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

roles/1password/tasks/Debian.yaml

@@ -1,48 +1 @@
----
+# TODO: https://support.1password.com/install-linux/#debian-or-ubuntu
-- name: add apt signing key
-  when: '"WSL" not in ansible_kernel'
-  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
-  when: '"WSL" not in ansible_kernel'
-  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
-  when: '"WSL" not in ansible_kernel'
-  become: true
-  apt:
-    name: 1password-cli
-    state: latest
-
-- name: create symlink to op.exe
-  when: '"WSL" in ansible_kernel'
-  file:
-    state: link
-    src: /mnt/c/Users/Benie/AppData/Local/1Password/cli/op.exe
-    dest: ~/.local/bin/op
-
-- include_tasks: zsh-completion.yaml

roles/1password/tasks/Windows.yaml

@@ -1,111 +1,12 @@
 ---
-# NOTE: The 1Password chocolatey packages are not up to date.
+- name: install chocolatey package
-
+  win_chocolatey:
-# GUI
+    name:
-- set_fact:
+      - 1password
-    app_exe: '{{ansible_env.LOCALAPPDATA}}/1Password/app/8/1Password.exe'
+    state: latest
-    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: 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'
+    icon: '{{ansible_env.LOCALAPPDATA}}/1Password/app/7/1Password.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:
-    argv:
-      - '{{ansible_env.LOCALAPPDATA}}/1Password/cli/op.exe'
-      - 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'

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/ag/tasks/Darwin.yaml

@@ -1,5 +1,5 @@
 ---
 - name: install homebrew package
-  homebrew:
+  apt:
     name: the_silver_searcher
     state: latest

roles/autodesk-fusion360/tasks/main.yaml

@@ -1,8 +0,0 @@
----
-- assert:
-    that: ansible_os_family == "Windows"
-
-- name: install chocolatey package
-  win_chocolatey:
-    name: autodesk-fusion360
-    state: latest

roles/autohotkey/tasks/main.yaml

@@ -9,10 +9,6 @@
     repo: git@code.infektor.net:config/AutoHotKey.git
     dest: '{{autohotkey_repo_dir}}'
     branch: master
-- win_owner:
-    path: '{{autohotkey_repo_dir}}'
-    user: Benie
-    recurse: true
 
 - name: create scheduled task
   win_scheduled_task:

roles/bat/tasks/Debian.yaml

@@ -1,13 +1,13 @@
 ---
-- set_fact:
+- name: install apt package
-    use_github: '{{
+  become: true
-        ansible_distribution == "Ubuntu" and
+  apt:
-        ansible_distribution_version == "18.04"
+    name: bat
-      }}'
+    state: latest
-- debug: msg={{use_github}}
 
-- when: use_github
+- name: update bat alternative
-  include_tasks: deb.yaml
+  become: true
-
+  alternatives:
-- when: not use_github
+    name: bat
-  include_tasks: apt.yaml
+    path: /usr/bin/batcat
+    link: /usr/local/bin/bat

roles/bat/tasks/Windows.yaml

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

roles/bat/tasks/apt.yaml

@@ -1,13 +0,0 @@
----
-- name: install apt package
-  become: true
-  apt:
-    name: bat
-    state: latest
-
-- name: update bat alternative
-  become: true
-  alternatives:
-    name: bat
-    path: /usr/bin/batcat
-    link: /usr/local/bin/bat

roles/bat/tasks/deb.yaml

@@ -1,65 +0,0 @@
----
-- name: get latest github release
-  uri:
-    url: https://api.github.com/repos/sharkdp/bat/releases/latest
-  register: latest
-
-- set_fact:
-    latest_version: '{{latest.json.tag_name[1:]}}'
-    bat_exe: '/usr/bin/bat'
-
-- name: check if already installed
-  stat:
-    path: '{{bat_exe}}'
-  register: bat_stat
-
-- name: get installed version
-  when: bat_stat.stat.exists == True
-  command: '{{bat_exe}} --version'
-  register: bat_version
-  changed_when: false
-
-- when: bat_stat.stat.exists == True
-  set_fact:
-    installed_version:
-      '{{bat_version.stdout.strip() | regex_replace("^.*(\d+\.\d+\.\d+).*$", "\1")}}'
-
-- when: ansible_machine == "x86_64"
-  set_fact:
-    arch: amd64
-
-- assert:
-    that: arch is defined
-    fail_msg: 'Architecture not currently supported: {{ansible_machine}}'
-
-- set_fact:
-    assets: '{{latest.json.assets}}'
-    asset_query: '[?contains(name, `bat-musl_`)] | [?contains(name, `amd64.deb`)] | [0]'
-    pkg_dir: '{{ansible_env.HOME}}/.local/pkg/bat'
-- set_fact:
-    asset: '{{assets | to_json | from_json | json_query(asset_query)}}'
-    bat_deb: '{{pkg_dir}}/bat.deb'
-
-- name: create directory for deb file download
-  file:
-    state: directory
-    path: '{{pkg_dir}}'
-
-- name: download .deb file
-  when: installed_version is not defined or installed_version != latest_version
-  get_url:
-    url: '{{asset.browser_download_url}}'
-    dest: '{{bat_deb}}'
-
-- name: install .deb file
-  when: installed_version is not defined or installed_version != latest_version
-  become: true
-  apt:
-    deb: '{{bat_deb}}'
-
-- name: remove .deb file
-  when: installed_version is not defined or installed_version != latest_version
-  file:
-    state: absent
-    path: '{{bat_deb}}'
-  changed_when: false

roles/curl/tasks/Debian.yaml

@@ -1,6 +0,0 @@
----
-- name: install apt package
-  become: true
-  apt:
-    name: curl
-    state: latest

roles/curl/tasks/Windows.yaml

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

roles/fzf/tasks/Debian.yaml

@@ -1,6 +1,12 @@
 ---
 - name: install apt package
+  when: ansible_distribution == "Debian" and
+        ansible_distribution_version == "unstable"
   become: true
   apt:
     name: fzf
     state: latest
+
+- include_tasks: Debian-old.yaml
+  when: not (ansible_distribution == "Debian" and
+             ansible_distribution_version == "unstable")

roles/gdb/tasks/Debian.yaml

@@ -1,6 +0,0 @@
----
-- name: install apt package
-  become: true
-  apt:
-    name: gdb
-    state: latest

roles/gdb/tasks/gdb-11.1-config.yaml

@@ -1,11 +0,0 @@
----
-- set_fact:
-    gdb_config_dir: '{{ansible_env.HOME}}/.config/gdb'
-
-- name: create config directory
-  file:
-    path: '{{gdb_config_dir}}'
-    state: directory
-
-- set_fact:
-    gdb_config_file: '{{gdb_config_dir}}/gdbinit'

roles/gdb/tasks/main.yaml

@@ -1,34 +0,0 @@
----
-- include_tasks: '{{ansible_os_family}}.yaml'
-
-# gdb 11.1 introduced support for config files that respect the XDG base
-# directory spec, handle the boths paths dependant on the gdb version install.
-- name: get installed version
-  command: gdb --version
-  register: gdb_version_output
-  changed_when: false
-
-- set_fact:
-    gdb_version: '{{gdb_version_output.stdout | regex_search("(\d+)\.(\d+)", "\1", "\2")}}'
-- set_fact:
-    gdb_xdg_base_dir_check:
-      gdb_version[0] | int > 11 or (
-        gdb_version[0] | int == 11 and gdb_version[1] | int == 1
-      )
-
-- set_fact:
-    gdb_config_file: '{{ansible_env.HOME}}/.gdbinit'
-    gdb_state_dir: '{{ansible_env.HOME}}/.local/state/gdb'
-
-- when: gdb_xdg_base_dir_check
-  include_tasks: gdb-11.1-config.yaml
-
-- name: create config file
-  template:
-    src: gdbinit
-    dest: '{{gdb_config_file}}'
-
-- name: create state directory
-  file:
-    path: '{{gdb_state_dir}}'
-    state: directory

roles/gdb/templates/gdbinit

@@ -1,3 +0,0 @@
-# Enable saving command history
-set history filename {{gdb_state_dir}}/history
-set history save on

roles/git/tasks/Windows-installer.yaml

@@ -1,34 +0,0 @@
----
-- name: get json containing all releases
-  win_uri:
-    url: 'https://api.github.com/repos/git-for-windows/git/releases/tags/v{{git_version}}.windows.1'
-    return_content: true
-  register: git_release
-
-- set_fact:
-    git_installer_exe: 'Git-{{git_version}}-64-bit.exe'
-- set_fact:
-    git_asset_query: '[?contains(name, `{{git_installer_exe}}`)] | [0]'
-    git_installer_path: '{{ansible_env.TEMP}}/{{git_installer_exe}}'
-- name: select asset from release
-  set_fact:
-    git_asset: '{{git_release.json.assets | json_query(git_asset_query)}}'
-
-- name: download installer
-  win_get_url:
-    url: '{{git_asset.browser_download_url}}'
-    dest: '{{git_installer_path}}'
-
-- name: run installer command
-  win_command:
-    argv:
-      - '{{git_installer_path}}'
-      - '/GitAndUnixToolsOnPath'
-      - '/NoShellIntegration'
-      - '/NoGuiHereIntegration'
-      - '/NoCredentialManager'
-      - '/NoOpenSSH'
-      - '/Silent'
-      - '/SuppressMsgBoxes'
-      - '/NoCancel'
-      - '/NoRestart'

roles/git/tasks/Windows.yaml

@@ -1,35 +1,14 @@
 ---
-# Pinned to 2.36.1 because the unofficial win_git module hangs when using
+- name: install chocolatey package
-# 2.37.3, this is either a breaking change in 2.37.x or an incompatibility with
+  win_chocolatey:
-# the win_git module. The git chocolatey package does not respect the version
+    name: git
-# argument and always installs the most recent version, so instead download the
+    package_params: >-
-# installer from GitHub and install manually.
+      /GitAndUnixToolsOnPath
-- set_fact:
+      /NoShellIntegration
-    git_version: 2.36.1
+      /NoGuiHereIntegration
-    git_cli_exe: '{{ansible_env.ProgramFiles}}/Git/cmd/git.exe'
+      /NoCredentialManager
-    git_run_installer: false
+      /NoOpenSSH
-
+    state: latest
-- name: detect if Git for Windows is installed
-  win_stat:
-    path: '{{git_cli_exe}}'
-  register: git_cli_stat
-
-- when: not git_cli_stat.stat.exists
-  set_fact:
-    git_run_installer: true
-
-- name: check installed version
-  when: git_cli_stat.stat.exists
-  win_command: '"{{git_cli_exe}}" --version'
-  register: git_cli_version
-  changed_when: false
-
-- when: git_cli_stat.stat.exists and git_version not in git_cli_version.stdout
-  set_fact:
-    git_run_installer: true
-
-- include_tasks: Windows-installer.yaml
-  when: git_run_installer
 
 - name: clone config repos
   win_git:
@@ -37,11 +16,6 @@
     dest: '{{ansible_env.USERPROFILE}}/.config/{{item.name}}'
     version: master
   with_items: '{{git_config_repos}}'
-- win_owner:
-    path: '{{ansible_env.USERPROFILE}}/.config/{{item.name}}'
-    user: Benie
-    recurse: true
-  with_items: '{{git_config_repos}}'
 
 # - TODO: install pip packages
 #   win_pip:

roles/htop/tasks/Darwin.yaml

@@ -1,5 +0,0 @@
----
-- name: install homebrew package
-  homebrew:
-    name: htop
-    state: latest

roles/htop/tasks/Debian.yaml

@@ -1,6 +0,0 @@
----
-- name: install apt package
-  become: true
-  apt:
-    name: htop
-    state: latest

roles/htop/tasks/main.yaml

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

roles/jp/tasks/Darwin.yaml

@@ -1,38 +0,0 @@
----
-- name: get latest github release
-  uri:
-    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]'
-    assets: '{{latest.json.assets}}'
-    latest_version: '{{latest.json.tag_name}}'
-    jp_exe: '{{ansible_env.HOME}}/.local/bin/jp'
-
-- name: check if already installed
-  stat:
-    path: '{{jp_exe}}'
-  register: jp_exe
-
-- name: get installed version
-  when: jp_stat.stat.exists == True
-  command: '{{jp_exe}} --version'
-  register: jp_version_output
-  changed_when: false
-
-- when: jp_stat.stat.exists == True
-  set_fact:
-    installed_version:
-      '{{jp_version_output.stdout.strip() | regex_replace("^.*(\d+\.\d+\.\d+).*$", "\1")}}'
-
-- set_fact:
-    asset: '{{assets | to_json | from_json | json_query(asset_query)}}'
-
-- name: download executable
-  when: installed_version is not defined or installed_version != latest_version
-  get_url:
-    url: '{{asset.browser_download_url}}'
-    dest: '{{jp_exe}}'
-    mode: +x

roles/jp/tasks/Debian.yaml

@@ -1,6 +0,0 @@
----
-- name: install apt package
-  become: true
-  apt:
-    name: jp
-    state: latest

roles/jp/tasks/main.yaml

@@ -1,4 +0,0 @@
----
-- assert:
-    that: ansible_os_family != "Windows"
-- include_tasks: '{{ansible_os_family}}.yaml'

roles/jq/tasks/Darwin.yaml

@@ -1,5 +0,0 @@
----
-- name: install homebrew package
-  homebrew:
-    name: jq
-    state: latest

roles/jq/tasks/Debian.yaml

@@ -1,5 +0,0 @@
----
-- name: install apt package
-  apt:
-    name: jq
-    state: latest

roles/jq/tasks/Windows.yaml

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

roles/jq/tasks/main.yaml

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

roles/moonlight/tasks/Windows.yaml

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

roles/moonlight/tasks/main.yaml

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

roles/neovim/tasks/Darwin.yaml

@@ -4,4 +4,4 @@
     name: neovim
     state: latest
 
-- include_tasks: Unix.yaml
+- include_tasks: unix.yaml

roles/neovim/tasks/Debian.yaml

@@ -5,4 +5,4 @@
     name: neovim
     state: latest
 
-- include_tasks: Unix.yaml
+- include_tasks: unix.yaml

roles/neovim/tasks/Unix-plugins.yaml

@@ -1,36 +0,0 @@
----
-- name: clone plugin repos
-  git:
-    repo: 'https://github.com/{{item.repo}}.git'
-    dest: '{{plugin_dir}}/{{item.mode | default("start")}}/{{item.repo | regex_replace("^.*\/(.*)$", "\1")}}'
-    version: '{{item.branch | default("HEAD")}}'
-  with_items: '{{plugins}}'
-
-- name: get list of managed plugin paths
-  set_fact:
-    managed_plugins: >-
-      {{
-        managed_plugins | default([]) + [
-            plugin_dir + "/" +
-            item.mode | default("start") + "/" +
-            item.repo | regex_replace("^.*\/(.*)$", "\1")
-        ]
-      }}
-  with_items: '{{plugins}}'
-
-- name: find all installed plugin directories
-  find:
-    paths:
-      - '{{plugin_dir}}/start'
-      - '{{plugin_dir}}/opt'
-    file_type: directory
-  register: found_plugins
-
-- name: remove found plugins which are not in the managed list
-  file:
-    path: '{{item.path}}'
-    state: absent
-  with_items: '{{found_plugins.files}}'
-  when: item.path not in managed_plugins
-  loop_control:
-    label: '{{item.path}}'

roles/neovim/tasks/Unix.yaml

@@ -1,28 +0,0 @@
----
-- set_fact:
-    vim_config_dir: '{{ansible_env.HOME}}/.config/nvim'
-
-- name: clone config repo
-  git:
-    repo: git@code.infektor.net:config/vim.git
-    dest: '{{vim_config_dir}}'
-    version: master
-
-# TODO: - name: set repo email
-
-- name: install pip packages
-  pip:
-    name: '{{neovim_pip_packages}}'
-    state: latest
-    extra_args: --user
-
-- name: check for config repo tasks.yaml
-  stat:
-    path: '{{vim_config_dir}}/tasks.yaml'
-  register: config_repo_tasks
-
-- when: config_repo_tasks.stat.exists
-  include_tasks: '{{vim_config_dir}}/tasks.yaml'
-
-- when: plugin_dir is defined and plugins is defined
-  include_tasks: 'Unix-plugins.yaml'

roles/neovim/tasks/Windows-plugins.yaml

@@ -1,36 +0,0 @@
----
-- name: clone plugin repos
-  win_git:
-    repo: 'https://github.com/{{item.repo}}.git'
-    dest: '{{plugin_dir}}/{{item.mode | default("start")}}/{{item.repo | regex_replace("^.*\/(.*)$", "\1")}}'
-    branch: '{{item.branch | default("HEAD")}}'
-  with_items: '{{plugins}}'
-
-- name: get list of managed plugin paths
-  set_fact:
-    managed_plugins: >-
-      {{
-        managed_plugins | default([]) + [
-            plugin_dir + "/" +
-            item.mode | default("start") + "/" +
-            item.repo | regex_replace("^.*\/(.*)$", "\1")
-        ]
-      }}
-  with_items: '{{plugins}}'
-
-- name: find all start plugin directories
-  win_find:
-    paths:
-      - '{{plugin_dir}}/start'
-      - '{{plugin_dir}}/opt'
-    file_type: directory
-  register: found_plugins
-
-- name: remove found plugins which are not in the managed list
-  win_file:
-    path: '{{item.path}}'
-    state: absent
-  with_items: '{{found_plugins.files}}'
-  when: item.path not in managed_plugins
-  loop_control:
-    label: '{{item.path}}'

roles/neovim/tasks/Windows.yaml

@@ -1,27 +1,14 @@
 ---
-
 - name: install chocolatey packages
   win_chocolatey:
     name: neovim
     state: latest
 
-- set_fact:
-    vim_config_dir: '{{ansible_env.LOCALAPPDATA}}\nvim'
-
 - name: clone config repo
   win_git:
     repo: git@code.infektor.net:config/vim.git
-    dest: '{{vim_config_dir}}'
+    dest: '{{ansible_env.LOCALAPPDATA}}/nvim'
-    branch: master
+    version: master
-    # clone: false
-    update: true
-- win_owner:
-    path: '{{vim_config_dir}}'
-    user: Benie
-    recurse: true
-
-- assert:
-    that: False
 
 # - TODO: neovim set repo email
 #   win_git_config:
@@ -36,27 +23,3 @@
     dest: '{{ansible_env.ProgramData}}/Microsoft/Windows/Start Menu/Programs/nvim-qt.lnk'
     icon: '{{ansible_env.ChocolateyToolsLocation}}/neovim/nvim-win64/bin/nvim-qt.exe,0'
     directory: '{{ansible_env.USERPROFILE}}'
-
-- name: check for config repo tasks.yaml
-  win_stat:
-    path: '{{vim_config_dir}}/tasks.yaml'
-  register: config_repo_tasks
-
-# TODO: this doesn't work for non localhost setups
-# probably need to copy the tasks.yaml and plugins.yaml to the controller in a
-# temporary directory then include them
-- when: config_repo_tasks.stat.exists
-  fetch:
-    src: '{{vim_config_dir}}/tasks.yaml'
-    dest: vim_config_tasks.yaml
-    flat: true
-
-- when: config_repo_tasks.stat.exists
-  include_tasks: vim_config_tasks.yaml
-
-- when: ansible_os_family != "Windows" and
-        plugin_dir is defined and plugins is defined
-  include_tasks: 'Unix-plugins.yaml'
-- when: ansible_os_family == "Windows" and
-        plugin_dir is defined and plugins is defined
-  include_tasks: 'Windows-plugins.yaml'

roles/neovim/tasks/unix.yaml

@@ -0,0 +1,14 @@
+---
+- name: clone config repo
+  git:
+    repo: git@code.infektor.net:config/vim.git
+    dest: ~/.config/nvim
+    version: master
+
+# TODO: - name: set repo email
+
+- name: install pip packages
+  pip:
+    name: '{{neovim_pip_packages}}'
+    state: latest
+    extra_args: --user

roles/obsidian/tasks/Windows.yaml

@@ -1,7 +1,4 @@
 ---
-- set_fact:
-    obsidian_notes_repo: '{{ansible_env.USERPROFILE}}/Documents/Notes'
-
 - name: install chocolatey package
   win_chocolatey:
     name: obsidian
@@ -10,9 +7,5 @@
 - name: clone notes repository
   win_git:
     repo: git@github.com:kbenzie/notes.git
-    dest: '{{obsidian_notes_repo}}'
+    dest: '{{ansible_env.USERPROFILE}}/Documents/Notes'
     branch: main
-- win_owner:
-    path: '{{obsidian_notes_repo}}'
-    user: Benie
-    recurse: true

roles/op/tasks/Darwin.yaml

@@ -1,5 +1,5 @@
 ---
 - name: install homebrew package
-  homebrew:
+  homebrew_cask:
-    name: curl
+    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

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

roles/powershell/tasks/main.yaml

@@ -1,44 +1,16 @@
 ---
-- set_fact:
-    powershell_config_dir:
-      '{{ansible_env.USERPROFILE}}/Documents/WindowsPowerShell'
-
 - name: clone config repos
   win_git:
     repo: git@code.infektor.net:config/WindowsPowerShell.git
-    dest: '{{powershell_config_dir}}'
+    dest: '{{ansible_env.USERPROFILE}}/Documents/WindowsPowerShell'
     branch: master
-- win_owner:
-    path: '{{powershell_config_dir}}'
-    user: Benie
-    recurse: true
 
 - name: install chocolatey package
   win_chocolatey:
     name: Cmder
     state: latest
 
-- name: get NuGet package provider
-  ansible.windows.win_powershell:
-    script:
-      Get-PackageProvider -Name NuGet
-  changed_when: false
-  register: nuget_package_provider
-
-- name: install NuGet package provider
-  when: nuget_package_provider.error | length > 0
-  ansible.windows.win_powershell:
-    script: |
-      Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force
-
 - name: install PsReadline module
   win_psmodule:
     name: PsReadline
     state: latest
-    accept_license: true
-
-- name: install posh-git module
-  win_psmodule:
-    name: posh-git
-    state: latest
-    accept_license: true

roles/powertoys/tasks/main.yaml

@@ -1,8 +0,0 @@
----
-- assert:
-    that: ansible_os_family == 'Windows'
-
-- name: install chocolatey package
-  win_chocolatey:
-    name: powertoys
-    state: present

roles/prusaslicer/tasks/main.yaml

@@ -1,8 +0,0 @@
----
-- assert:
-    that: ansible_os_family == "Windows"
-
-- name: install chocolatey package
-  win_chocolatey:
-    name: prusaslicer
-    state: latest

roles/readline/tasks/main.yaml

@@ -1,5 +0,0 @@
----
-- name: create .inputrc config file
-  template:
-    src: inputrc
-    dest: '{{ansible_env.HOME}}/.inputrc'

roles/readline/templates/inputrc

@@ -1,11 +0,0 @@
-# Enable vi mode
-set editing-mode vi
-
-# Insert mode mappings
-set keymap vi-insert
-"\C-[": vi-movement-mode
-
-# Change cursor shape on vi mode change
-set show-mode-in-prompt on
-set vi-cmd-mode-string "\1\e[2 q\2"
-set vi-ins-mode-string "\1\e[6 q\2"

roles/sudo/tasks/main.yaml

@@ -1,12 +0,0 @@
----
-- assert:
-    that: ansible_user_id != "root"
-
-- name: create /etc/sudoers.d/{user} config file
-  become: true
-  template:
-    src: sudoers
-    dest: '/etc/sudoers.d/{{ansible_user_id}}'
-    owner: root
-    group: root
-    mode: '0440'

roles/sudo/templates/sudoers

@@ -1 +0,0 @@
-{{ansible_user_id}}	ALL=(ALL)	NOPASSWD:ALL

roles/system-info/tasks/Debian.yaml

@@ -1,25 +1,5 @@
 ---
-- name: install apt packages
+# TODO:
-  become: true
+# cp $script_dir/system-info.service ~/.config/systemd/user/system-info.service
-  apt:
+# systemctl --user enable system-info
-    name:
+# systemctl --user start system-info
-      - 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

roles/tidy/tasks/Darwin.yaml

@@ -1,5 +0,0 @@
----
-- name: install homebrew package
-  homebrew:
-    name: tidy-html5
-    state: latest

roles/tidy/tasks/Debian.yaml

@@ -1,6 +0,0 @@
----
-- name: install apt package
-  become: true
-  apt:
-    name: tidy
-    state: latest

roles/tidy/tasks/main.yaml

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

roles/tmux/tasks/main.yaml

@@ -9,4 +9,31 @@
 
 # TODO: - name: set repo email
 
-- include_tasks: ~/.config/tmux/tasks.yaml
+- name: create layouts directory
+  file:
+    state: directory
+    dest: ~/.local/share/tmux/layouts
+
+- name: create symbolic links
+  file:
+    state: link
+    src: '{{item.src}}'
+    dest: '{{item.dest}}'
+  with_items:
+    - src: ~/.config/tmux/tmux.conf
+      dest: ~/.tmux.conf
+    - src: ~/.config/tmux/layouts/session-main
+      dest: ~/.local/share/tmux/layouts/session-main
+    - src: ~/.config/tmux/layouts/window-tall
+      dest: ~/.local/share/tmux/layouts/window-tall
+    - src: ~/.config/tmux/layouts/window-wide-left
+      dest: ~/.local/share/tmux/layouts/window-wide-left
+    - src: ~/.config/tmux/layouts/window-wide-right
+      dest: ~/.local/share/tmux/layouts/window-wide-right
+
+# TODO: - name: Enable tmux system-info service
+#   command: system-info/install.sh
+
+# TODO: WSL2 system-info
+#   when: '"WSL" in ansible_kernel'
+#   figure out best way to run daemon...

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;

roles/wget/tasks/Darwin.yaml

@@ -1,5 +0,0 @@
----
-- name: install homebrew package
-  homebrew:
-    name: wget
-    state: latest

roles/wget/tasks/Debian.yaml

@@ -1,5 +0,0 @@
----
-- name: install apt package
-  apt:
-    name: wget
-    state: latest

roles/wget/tasks/main.yaml

@@ -1,16 +0,0 @@
----
-- include_tasks: '{{ansible_os_family}}.yaml'
-
-- name: create directories
-  file:
-    state: directory
-    dest: '{{item}}'
-  with_items:
-    - ~/.config/wget
-    - ~/.cache/wget
-
-- name: create config file
-  copy:
-    content: |
-      hsts-file = {{ansible_env.HOME}}/.cache/wget/hsts
-    dest: ~/.config/wget/rc

roles/wsl/tasks/main.yaml

@@ -40,21 +40,3 @@
   with_items:
     - win_git.ps1
     - win_git.py
-
-- name: read /etc/resolv.conf file contents
-  set_fact:
-    resolv_conf: '{{lookup("ansible.builtin.file", "/etc/resolv.conf")}}'
-
-- name: get Windows host IP from /etc/resolv.conf
-  set_fact:
-    host_ip: '{{resolv_conf | regex_search("(\d+\.\d+\.\d+\.\d+)")}}'
-
-- name: add $(hostname).local to /etc/hosts
-  become: true
-  lineinfile:
-    path: /etc/hosts
-    regexp: '^{{host_ip | replace(".", "\.")}}'
-    line: '{{host_ip}}	{{ansible_hostname}}.local'
-    owner: root
-    group: root
-    mode: '0644'

roles/yq/tasks/Darwin.yaml

@@ -1,5 +0,0 @@
----
-- name: install homebrew package
-  homebrew:
-    name: yq
-    state: latest

roles/yq/tasks/Debian.yaml

@@ -1,37 +0,0 @@
----
-- name: get latest github release
-  uri:
-    url: https://api.github.com/repos/mikefarah/yq/releases/latest
-  register: latest
-
-- set_fact:
-    asset_query: '[?contains(name, `yq_linux_amd64`)] | [0]'
-    assets: '{{latest.json.assets}}'
-    latest_version: '{{latest.json.tag_name[1:]}}'
-    yq_exe: '{{ansible_env.HOME}}/.local/bin/yq'
-
-- name: check if already installed
-  stat:
-    path: '{{yq_exe}}'
-  register: yq_stat
-
-- name: get installed version
-  when: yq_stat.stat.exists == True
-  command: '{{yq_exe}} --version'
-  register: yq_version_output
-  changed_when: false
-
-- when: yq_stat.stat.exists == True
-  set_fact:
-    installed_version:
-      '{{yq_version_output.stdout.strip() | regex_replace("^.*(\d+\.\d+\.\d+).*$", "\1")}}'
-
-- set_fact:
-    asset: '{{assets | to_json | from_json | json_query(asset_query)}}'
-
-- name: download executable
-  when: installed_version is not defined or installed_version != latest_version
-  get_url:
-    url: '{{asset.browser_download_url}}'
-    dest: '{{yq_exe}}'
-    mode: +x

roles/yq/tasks/main.yaml

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

roles/zsh/tasks/main.yaml

@@ -20,8 +20,6 @@
       dest: ~/.config/zsh/zsh-syntax-highlighting
     - repo: https://github.com/zsh-users/zsh-completions.git
       dest: ~/.config/zsh/zsh-completions
-  loop_control:
-    label: '{{item.repo | regex_search("https://github.com/(.*)\.git$", "\1")}}'
 
 - name: create directories
   file:
@@ -61,8 +59,6 @@
       dest: ~/.local/bin/cmake-uninstall
     - src: ~/.config/zsh/$
       dest: ~/.local/bin/$
-  loop_control:
-    label: '{{item.dest}}'
 
 - name: get absolute path
   shell: command -v zsh