Fix zsh role to set zsh as default shell

.vim/coc-settings.json

@@ -1,12 +0,0 @@
-{
-  "yaml.schemas": {
-    "https://raw.githubusercontent.com/ansible-community/schemas/main/f/ansible.json#/$defs/playbook": [
-      "./*.yaml"
-    ],
-    "https://raw.githubusercontent.com/ansible-community/schemas/main/f/ansible.json#/$defs/tasks": [
-      "./roles/*/handlers/*.yaml",
-      "./roles/*/tasks/*.yaml",
-      "./tasks.yaml"
-    ]
-  }
-}

WSL.yaml

@@ -1,3 +0,0 @@
----
-- import_playbook: Unix.yaml
-- import_playbook: Windows.yaml

Windows.yaml

@@ -1,4 +1,14 @@
 ---
+- import_playbook: unix.yaml
+
+- hosts: localhost
+
+  # FIXME: Roles which depend on the win_git module can't be in the same
+  # playbook on the first run because the wsl role hasn't added the win_git
+  # module to the modules path yet.
+  roles:
+    - role: wsl
+
 - hosts: windows
 
   roles:
@@ -7,9 +17,7 @@
     - role: system-info
 
     - role: ag
-    - role: fzf
     - role: git
-    - role: op
     - role: tree
 
     - role: llvm

roles/ag/tasks/Windows.yaml

@@ -1,5 +1,5 @@
 ---
-- name: install chocolatey package
+- name: install choco package
   win_chocolatey:
     name: ag
     state: latest

roles/fzf/tasks/Darwin.yaml

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

roles/fzf/tasks/Debian-old.yaml

@@ -1,13 +0,0 @@
----
-- name: clone fzf repo
-  git:
-    repo: https://github.com/junegunn/fzf.git
-    dest: ~/.local/src/fzf
-  notify: install fzf binaries
-- meta: flush_handlers
-
-- name: create symbolic links
-  file:
-    state: link
-    src: ~/.local/src/fzf/bin/fzf
-    dest: ~/.local/bin/fzf

roles/fzf/tasks/Debian.yaml

@@ -1,12 +0,0 @@
----
-- 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/fzf/tasks/Windows.yaml

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

roles/fzf/tasks/main.yaml

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

roles/llvm/tasks/Debian-unstable.yaml

@@ -0,0 +1,13 @@
+---
+- name: install apt packages
+  become: true
+  apt:
+    name:
+      - clang
+      - clang-format
+      - clang-tidy
+      - clang-tools
+      - clangd
+      - llvm
+    state: latest
+    install_recommends: true

roles/llvm/tasks/Debian.yaml

@@ -1,13 +1,2 @@
 ---
-- name: install apt packages
+- include_tasks: '{{ansible_distribution}}-{{ansible_distribution_version}}.yaml'
-  become: true
-  apt:
-    name:
-      - clang
-      - clang-format
-      - clang-tidy
-      - clang-tools
-      - clangd
-      - llvm
-    state: latest
-    install_recommends: true

roles/llvm/tasks/Ubuntu-18.04.yaml

@@ -0,0 +1,50 @@
+---
+- name: get list of releases from github
+  uri:
+    url: https://api.github.com/repos/llvm/llvm-project/releases
+  register: releases
+
+- name: select latest release with Ubuntu binaries
+  set_fact:
+    release: '{{releases.json | json_query("[?assets | [?contains(name, `x86_64-linux-gnu-ubuntu`)]] | [0]")}}'
+
+- name: select from latest available release with x86_64-linux-gnu-ubuntu asset
+  set_fact:
+    asset: '{{release | json_query("assets | [?contains(name, `x86_64-linux-gnu-ubuntu`)] | [?ends_with(name, `.tar.xz`)] | [0]")}}'
+
+- name: process release name for /usr/local/lib/{{package_name}}
+  set_fact:
+    package_name: '{{release.name | lower | regex_replace(" (\d+)\.\d+\.\d+", "-\1")}}'
+
+- name: set path for archive download
+  set_fact:
+    archive_path: '/tmp/{{asset.name}}'
+
+- name: download release archive
+  get_url:
+    url: '{{asset.browser_download_url}}'
+    dest: '{{archive_path}}'
+
+- name: create package directory
+  become: true
+  file:
+    path: '/usr/local/lib/{{package_name}}'
+    state: directory
+
+# TODO: don't extract when not actually doing a n update
+- name: extract release archive
+  become: true
+  unarchive:
+    src: '{{archive_path}}'
+    dest: '/usr/local/lib/{{package_name}}'
+    extra_opts: ['--strip-components', '1']
+
+- name: create symlinks from /usr/local/lib/{package_name}} to /usr/local/bin
+  become: true
+  file:
+    src: '{{item}}'
+    dest: '/usr/local/bin/{{item | basename}}'
+    state: link
+  with_fileglob: '/usr/local/lib/{{package_name}}/bin/*'
+
+# TODO: cleanup old installs?

roles/llvm/tasks/Ubuntu.yaml

@@ -1,66 +0,0 @@
----
-- name: get latest stable github release
-  uri:
-    url: https://api.github.com/repos/llvm/llvm-project/releases/latest
-  register: llvm_latest
-
-- set_fact:
-    llvm_major_version:
-      '{{llvm_latest.json.tag_name[8:llvm_latest.json.tag_name.find(".")]}}'
-- set_fact:
-    llvm_apt_repo_url:
-      'http://apt.llvm.org/{{ansible_distribution_release}}/'
-    llvm_apt_category:
-      'llvm-toolchain-{{ansible_distribution_release}}-{{llvm_major_version}}'
-
-- name: add upstream deb repository
-  become: true
-  apt_repository:
-    repo: 'deb {{llvm_apt_repo_url}} {{llvm_apt_category}} main'
-    state: present
-    filename: llvm
-    update_cache: false
-
-- name: add upstream deb-src repository
-  become: true
-  apt_repository:
-    repo: 'deb-src {{llvm_apt_repo_url}} {{llvm_apt_category}} main'
-    state: present
-    filename: llvm
-    update_cache: false
-
-- name: add apt repository key
-  become: true
-  apt_key:
-    url: https://apt.llvm.org/llvm-snapshot.gpg.key
-    id: 6084F3CF814B57C1CF12EFD515CF4D18AF4F7421
-    state: present
-
-- name: update apt cache
-  become: true
-  apt:
-    update_cache: true
-
-- name: install apt packages
-  become: true
-  apt:
-    name:
-      - clang-{{llvm_major_version}}
-      - clang-format-{{llvm_major_version}}
-      - clang-tidy-{{llvm_major_version}}
-      - clang-tools-{{llvm_major_version}}
-      - clangd-{{llvm_major_version}}
-      - llvm-{{llvm_major_version}}
-    state: latest
-    install_recommends: true
-
-- name: update alternatives
-  become: true
-  alternatives:
-    link: '/usr/bin/{{item}}'
-    name: '{{item}}'
-    path: '/usr/bin/{{item}}-{{llvm_major_version}}'
-    priority: '{{llvm_major_version}}0'
-  with_items:
-    - clang-format
-    - clangd

roles/llvm/tasks/main.yaml

@@ -1,5 +1,2 @@
 ---
 - include_tasks: '{{ansible_os_family}}.yaml'
-  when: ansible_os_family in ['Darwin', 'Windows']
-- include_tasks: '{{ansible_distribution}}.yaml'
-  when: ansible_os_family not in ['Darwin', 'Windows']

roles/neovim/tasks/Windows.yaml

@@ -1,5 +1,5 @@
 ---
-- name: install chocolatey packages
+- name: install choco packages
   win_chocolatey:
     name: neovim
     state: latest

roles/nodejs/tasks/Debian.yaml

@@ -7,22 +7,22 @@
 - name: create directory for downloaded package
   file:
     state: directory
-    dest: ~/.local/src/node
+    dest: ~/.local/src
 
 - name: download latest package
   get_url:
     url: 'https://nodejs.org/dist/{{latest.json[0].version}}/node-{{latest.json[0].version}}-linux-x64.tar.gz'
-    dest: ~/.local/src/node/node.tar.gz
+    dest: ~/.local/src/node.tar.gz
 
 - name: extract downloaded package
   unarchive:
-    src: ~/.local/src/node/node.tar.gz
+    src: ~/.local/src/node.tar.gz
-    dest: ~/.local/src/node
+    dest: ~/.local/src
     remote_src: true
 
-- name: create symbolic links
+- name: create symlink links
   file:
     state: link
-    src: '~/.local/src/node/node-{{latest.json[0].version}}-linux-x64/bin/{{item}}'
+    src: '~/.local/src/node-{{latest.json[0].version}}-linux-x64/bin/{{item}}'
     dest: '~/.local/bin/{{item}}'
   with_items: [corepack, node, npm, npx]

roles/nodejs/tasks/Windows.yaml

@@ -1,5 +1,5 @@
 ---
-- name: install chocolatey package
+- name: install choco package
   win_chocolatey:
     name: nodejs
     state: latest

roles/op/tasks/Darwin.yaml

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

roles/op/tasks/Debian.yaml

@@ -1,38 +0,0 @@
----
-- 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 +0,0 @@
----
-- name: install chocolatey package
-  win_chocolatey:
-    name: op
-    state: latest

roles/op/tasks/main.yaml

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

roles/python/tasks/Debian.yaml

@@ -3,8 +3,7 @@
   become: true
   apt:
     name:
-      - python-is-python3
       - python3
       - python3-pip
-      - python3-venv
       - python3-virtualenv
+      - python-is-python3

roles/tree/tasks/Windows.yaml

@@ -1,5 +1,5 @@
 ---
-- name: install chocolatey package
+- name: install choco package
   win_chocolatey:
     name: tree
     state: latest

roles/webcatalog/tasks/Darwin.yaml

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

roles/webcatalog/tasks/Debian.yaml

@@ -1,31 +0,0 @@
----
-- 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

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

roles/webcatalog/tasks/main.yaml

@@ -1,19 +0,0 @@
----
-- 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

@@ -1,11 +0,0 @@
-[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/wsl/tasks/main.yaml

@@ -1,38 +1,17 @@
 ---
-- name: install apt packages
-  become: true
-  apt:
-    name: sshpass
-    state: latest
-
-- name: create /etc/ansible
-  become: true
-  file:
-    dest: /etc/ansible
-    state: directory
-
-- name: create hosts file
-  become: true
-  template:
-    src: templates/hosts.j2
-    dest: /etc/ansible/hosts
-
 - name: create external directory
   file:
     dest: external
     state: directory
-
 - name: clone ansible win_git module
   git:
     repo: https://github.com/tivrobo/ansible-win_git.git
     dest: external/ansible-win_git
     version: master
-
 - name: create ansible modules directory
   file:
     dest: ~/.ansible/plugins/modules
     state: directory
-
 - name: copy win_git files to ansible modules directory
   copy:
     src: '~/.config/local/external/ansible-win_git/{{item}}'

roles/wsl/templates/hosts.j2

@@ -1,9 +0,0 @@
----
-all:
-  children:
-    windows:
-      hosts:
-        {{ansible_hostname}}.local:
-          ansible_user: {{ansible_user_id}}
-          ansible_connection: ssh
-          ansible_shell_type: cmd

roles/zsh/handlers/main.yaml

@@ -1,4 +1,4 @@
 ---
 - name: install fzf binaries
   command:
-    cmd: ~/.local/src/fzf/install --bin
+    cmd: ~/.config/zsh/fzf/install --bin

roles/zsh/tasks/main.yaml

@@ -21,6 +21,13 @@
     - repo: https://github.com/zsh-users/zsh-completions.git
       dest: ~/.config/zsh/zsh-completions
 
+- name: clone fzf repo
+  git:
+    repo: https://github.com/junegunn/fzf.git
+    dest: ~/.config/zsh/fzf
+  notify: install fzf binaries
+- meta: flush_handlers
+
 - name: create directories
   file:
     state: directory
@@ -55,6 +62,10 @@
       dest: ~/.local/share/zsh/site-functions/_layout
     - src: ~/.config/zsh/notes/_note
       dest: ~/.local/share/zsh/site-functions/_note
+    - src: ~/.config/zsh/fzf/bin/fzf
+      dest: ~/.local/bin/fzf
+    - src: ~/.config/zsh/fzf/bin/fzf-tmux
+      dest: ~/.local/bin/fzf-tmux
     - src: ~/.config/zsh/cmake-uninstall
       dest: ~/.local/bin/cmake-uninstall
     - src: ~/.config/zsh/$
@@ -67,6 +78,6 @@
 
 - name: set default shell
   user:
-    name: '{{ansible_user_id}}'
+    name: '{{ansible_env.USERNAME}}'
     shell: '{{zsh.stdout}}'
   become: true

unix.yaml

@@ -9,14 +9,9 @@
 
     - role: ag
     - role: bat
-    - role: fzf
     - role: git
-    - role: op
     - role: tree
 
     - role: llvm
     - role: nodejs
     - role: python
-
-    - role: wsl
-      when: '"WSL" in ansible_kernel'