Add moonlight role for Windows

Role installs the [Moonlight](https://moonlight-stream.org/) game
streaming client.

.gitignore

@@ -1,3 +1 @@
 external
-modules/win_git*
-playbooks/test.yaml

.vim/coc-settings.json

@@ -0,0 +1,12 @@
+{
+  "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"
+    ]
+  }
+}

Unix.yaml

@@ -1,32 +1,34 @@
 ---
 - hosts: localhost
+
   roles:
     - role: sudo
       when: ansible_user_id != "root"
-    - role: python
 
     - role: zsh
     - role: neovim
     - role: tmux
+    - role: system-info
+      when: '"WSL" not in ansible_kernel'
 
     - role: ag
-    - role: bash
     - role: bat
     - role: curl
-    - role: editline
     - role: fzf
-    - role: gh
     - role: git
-    - role: glab
     - role: htop
     - role: jp
     - role: jq
     - role: readline
     - role: tidy
     - role: tree
-    - role: watch
-    - role: wget
     - role: yq
 
     - role: llvm
     - role: nodejs
+    - role: python
+
+    - role: 1password
+
+    - role: wsl
+      when: '"WSL" in ansible_kernel'

WSL.yaml

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

Windows.yaml

@@ -5,7 +5,6 @@
     install_cad_apps: false
 
   roles:
-    - role: python
     - role: git
     - role: powershell
     - role: neovim
@@ -15,13 +14,13 @@
     - role: bat
     - role: curl
     - role: fzf
-    - role: gh
-    - role: jq
     - role: tree
+    - role: jq
     - role: yq
 
     - role: llvm
     - role: nodejs
+    - role: python
 
     - role: 1password
     - role: autohotkey

ansible.cfg

@@ -1,5 +0,0 @@
-[defaults]
-collections_path = collections
-library = modules
-roles_path = roles
-stdout_callback = yaml

macOS.yaml

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

playbooks/1password.yaml

@@ -1,4 +0,0 @@
----
-- hosts: localhost
-  roles:
-    - 1password

playbooks/Linux.yaml

@@ -1,3 +0,0 @@
----
-- import_playbook: LinuxCLI.yaml
-- import_playbook: UnixGUI.yaml

playbooks/LinuxCLI.yaml

@@ -1,5 +0,0 @@
----
-- hosts: localhost
-  roles:
-    - role: gdb
-    - role: system-info

playbooks/UnixGUI.yaml

@@ -1,7 +0,0 @@
----
-- hosts: localhost
-  roles:
-    - role: 1password
-    - role: fonts
-    - role: obsidian
-    - role: webcatalog

playbooks/WSL.yaml

@@ -1,6 +0,0 @@
----
-- import_playbook: UnixCLI.yaml
-- hosts: localhost
-  roles:
-    - role: gdb
-    - role: wsl

playbooks/macOS.yaml

@@ -1,14 +0,0 @@
----
-- import_playbook: UnixCLI.yaml
-- hosts: localhost
-  roles:
-    - role: system-info
-- import_playbook: UnixGUI.yaml
-- hosts: localhost
-  roles:
-    - role: mas
-
-    - role: iterm
-    - role: magnet
-    - role: microsoft-remote-desktop
-    - role: viscosity

roles/1password/tasks/Debian.yaml

@@ -1,13 +1,10 @@
 ---
-- set_fact:
-    keyring: /etc/apt/trusted.gpg.d/1password-archive-keyring.gpg
-
 - 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: '{{keyring}}'
+    keyring: /etc/apt/trusted.gpg.d/1password-archive-keyring.gpg
     state: present
 
 - when: ansible_machine == 'x86_64'
@@ -23,9 +20,9 @@
   become: true
   apt_repository:
     repo: >-
-      deb [arch={{arch}} signed-by={{keyring}}]
+      deb [arch={{arch}}
+      signed-by=/etc/apt/trusted.gpg.d/1password-archive-keyring.gpg]
       https://downloads.1password.com/linux/debian/{{arch}} stable main
-    filename: 1password
 
 - name: install gui package
   when: '"WSL" not in ansible_kernel'

roles/1password/tasks/RedHat.yaml

@@ -1,22 +0,0 @@
----
-- name: add yum repository key
-  become: true
-  rpm_key:
-    key: https://downloads.1password.com/linux/keys/1password.asc
-
-- name: add yum repository
-  become: true
-  yum_repository:
-    name: 1password
-    description: 1Password Stable Channel
-    baseurl: https://downloads.1password.com/linux/rpm/stable/$basearch
-    enabled: true
-    gpgcheck: true
-    repo_gpgcheck: true
-    gpgkey: ['https://downloads.1password.com/linux/keys/1password.asc']
-
-- name: install yum package
-  become: true
-  yum:
-    name: 1password
-    state: latest

roles/1password/tasks/main.yaml

@@ -1,3 +1,2 @@
 ---
 - include_tasks: '{{ansible_os_family}}.yaml'
-# TODO: If gnome-shell on wayland set global key binding in custom keyboard settings

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

@@ -4,11 +4,6 @@
   register: zsh_completion_script
   changed_when: false
 
-- name: create local zsh site functions directory
-  file:
-    state: directory
-    path: ~/.local/share/zsh/site-functions
-
 - name: create op zsh completion file
   copy:
     content: '{{zsh_completion_script.stdout}}'

roles/ag/tasks/RedHat.yaml

@@ -1,6 +0,0 @@
----
-- name: install yum package
-  become: true
-  yum:
-    name: the_silver_searcher
-    state: latest

roles/bash/tasks/main.yaml

@@ -1,5 +0,0 @@
----
-- name: create ~/.bashrc file
-  template:
-    src: templates/bashrc
-    dest: ~/.bashrc

roles/bash/templates/bashrc

@@ -1,112 +0,0 @@
-# If not running interactively, don't do anything
-case $- in
-    *i*) ;;
-      *) return;;
-esac
-
-# don't put duplicate lines or lines starting with space in the history.
-# See bash(1) for more options
-HISTCONTROL=ignoreboth
-
-# append to the history file, don't overwrite it
-shopt -s histappend
-
-# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
-HISTSIZE=1000
-HISTFILESIZE=2000
-
-# check the window size after each command and, if necessary,
-# update the values of LINES and COLUMNS.
-shopt -s checkwinsize
-
-# make less more friendly for non-text input files, see lesspipe(1)
-[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
-
-# enable color support of ls and also add handy aliases
-if [ -x /usr/bin/dircolors ]; then
-  test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
-  alias ls='ls --color=auto'
-  alias dir='dir --color=auto'
-  alias vdir='vdir --color=auto'
-  alias grep='grep --color=auto'
-  alias fgrep='fgrep --color=auto'
-  alias egrep='egrep --color=auto'
-fi
-
-if [ -f ~/.bash_aliases ]; then
-    . ~/.bash_aliases
-fi
-
-# enable programmable completion features (you don't need to enable
-# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
-# sources /etc/bash.bashrc).
-if ! shopt -oq posix; then
-  if [ -f /usr/share/bash-completion/bash_completion ]; then
-    . /usr/share/bash-completion/bash_completion
-  elif [ -f /etc/bash_completion ]; then
-    . /etc/bash_completion
-  fi
-fi
-
-# Enable vi mode
-set -o vi
-
-function _prompt_first_line {
-  local exit_code=$?
-  if [ "$exit_code" = "0" ]; then
-    exit_code=
-  else
-    # If the last command failed, display its error code at the right
-    case $exit_code in
-      129) exit_code="SIGHUP"     ;;  # 128 + 1
-      130) exit_code="SIGINT"     ;;  # 128 + 2
-      131) exit_code="SIGQUIT"    ;;  # 128 + 3
-      132) exit_code="SIGILL"     ;;  # 128 + 4
-      133) exit_code="SIGTRAP"    ;;  # 128 + 5
-      134) exit_code="SIGABRT"    ;;  # 128 + 6
-      134) exit_code="SIGIOT"     ;;  # 128 + 6
-      135) exit_code="SIGBUS"     ;;  # 128 + 7
-      136) exit_code="SIGFPE"     ;;  # 128 + 8
-      137) exit_code="SIGKILL"    ;;  # 128 + 9
-      138) exit_code="SIGUSR1"    ;;  # 128 + 10
-      139) exit_code="SIGSEGV"    ;;  # 128 + 11
-      140) exit_code="SIGUSR2"    ;;  # 128 + 12
-      141) exit_code="SIGPIPE"    ;;  # 128 + 13
-      142) exit_code="SIGALRM"    ;;  # 128 + 14
-      143) exit_code="SIGTERM"    ;;  # 128 + 15
-      144) exit_code="SIGSTKFLT"  ;;  # 128 + 16
-      145) exit_code="SIGCHLD"    ;;  # 128 + 17
-      146) exit_code="SIGCONT"    ;;  # 128 + 18
-      147) exit_code="SIGSTOP"    ;;  # 128 + 19
-      148) exit_code="SIGTSTP"    ;;  # 128 + 20
-      149) exit_code="SIGTTIN"    ;;  # 128 + 21
-      150) exit_code="SIGTTOU"    ;;  # 128 + 22
-      151) exit_code="SIGURG"     ;;  # 128 + 23
-      152) exit_code="SIGXCPU"    ;;  # 128 + 24
-      153) exit_code="SIGXFSZ"    ;;  # 128 + 25
-      154) exit_code="SIGVTALRM"  ;;  # 128 + 26
-      155) exit_code="SIGPROF"    ;;  # 128 + 27
-      156) exit_code="SIGWINCH"   ;;  # 128 + 28
-      157) exit_code="SIGIO"      ;;  # 128 + 29
-      158) exit_code="SIGPWR"     ;;  # 128 + 30
-      159) exit_code="SIGSYS"     ;;  # 128 + 31
-    esac
-    exit_code=" \e[1m\e[31m$exit_code\e[0m"
-  fi
-  local time=$(date +%H:%M:%S)
-  local dir=$PWD
-  [[ "$dir" =~ ^"$HOME"(/|$) ]] && dir="~${dir#$HOME}"
-  # TODO: virtualenv
-  local grey="\e[38;5;244m"
-  local reset="\e[0m"
-  local blue="\e[38;5;37m"
-  echo -e "$grey$time$reset $blue$dir$reset$exit_code"
-}
-
-PROMPT_COMMAND=_prompt_first_line
-
-yellow="\001\e[38;5;3m\002"
-grey="\001\e[38;5;244m\002"
-reset="\001\e[0m\002"
-
-PS1="$yellow\u$reset@$grey\h$reset "

roles/bat/tasks/Debian.yaml

@@ -4,6 +4,7 @@
         ansible_distribution == "Ubuntu" and
         ansible_distribution_version == "18.04"
       }}'
+- debug: msg={{use_github}}
 
 - when: use_github
   include_tasks: deb.yaml

roles/bat/tasks/RedHat.yaml

@@ -1,6 +0,0 @@
----
-- name: install yum package
-  become: true
-  yum:
-    name: bat
-    state: latest

roles/curl/tasks/RedHat.yaml

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

roles/editline/tasks/main.yaml

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

roles/editline/templates/editrc

@@ -1,3 +0,0 @@
-# Enable vi mode
-lldb:bind -v
-lldb:bind ^I lldb_complete

roles/fonts/handlers/main.yaml

@@ -1,3 +0,0 @@
----
-- name: refresh font cache
-  command: fc-cache

roles/fonts/tasks/Darwin.yaml

@@ -1,9 +0,0 @@
----
-- name: enable homebrew tap
-  homebrew_tap:
-    name: homebrew/cask-fonts
-
-- name: install Caskaydia Cove Nerd Font
-  homebrew_cask:
-    name: font-caskaydia-cove-nerd-font
-    state: latest

roles/fonts/tasks/Linux.yaml

@@ -1,56 +0,0 @@
----
-- name: stat version file
-  stat:
-    path: '{{ansible_env.HOME}}/.local/share/fonts/CaskaydiaCove.version'
-  register: version_file
-
-- name: slurp version
-  when: version_file.stat.exists
-  slurp:
-    path: '{{ansible_env.HOME}}/.local/share/fonts/CaskaydiaCove.version'
-  register: version_slurp
-
-- when: version_file.stat.exists
-  set_fact:
-    version: '{{version_slurp.content | b64decode}}'
-
-- name: get latest release
-  uri:
-    url: https://api.github.com/repos/ryanoasis/nerd-fonts/releases/latest
-  register: latest
-
-- set_fact:
-    needs_installed:
-      '{{ not version_file.stat.exists or version.strip() != latest.json.tag_name }}'
-    asset: '{{ latest.json.assets | to_json | from_json |
-      json_query("[?contains(name, `CascadiaCode.zip`)] | [0]") }}'
-
-- name: create user fonts directory
-  when: needs_installed
-  file:
-    path: '{{ansible_env.HOME}}/.local/share/fonts'
-    state: directory
-
-- name: download Caskaydia Cove Nerd Font archive
-  when: needs_installed
-  get_url:
-    url: '{{asset.browser_download_url}}'
-    dest: '{{ansible_env.HOME}}/.local/share/fonts/tmp.zip'
-
-- name: install Caskaydia Cove Nerd Font
-  when: needs_installed
-  unarchive:
-    src: '{{ansible_env.HOME}}/.local/share/fonts/tmp.zip'
-    dest: '{{ansible_env.HOME}}/.local/share/fonts'
-  notify: refresh font cache
-
-- name: write version file
-  copy:
-    content: '{{latest.json.tag_name}}'
-    dest: '{{ansible_env.HOME}}/.local/share/fonts/CaskaydiaCove.version'
-
-- name: remove Caskaydia Cove Nerd Font archive
-  when: needs_installed
-  file:
-    path: '{{ansible_env.HOME}}/.local/share/fonts/tmp.zip'
-    state: absent

roles/fonts/tasks/main.yaml

@@ -1,5 +0,0 @@
----
-- when: ansible_os_family == 'Darwin'
-  include_tasks: 'Darwin.yaml'
-- when: ansible_os_family != 'Darwin' and ansible_os_family != 'Windows'
-  include_tasks: 'Linux.yaml'

roles/fzf/tasks/Debian-apt.yaml

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

roles/fzf/tasks/Debian.yaml

@@ -1,8 +1,6 @@
 ---
-- when: ansible_distribution == 'Ubuntu' and
+- name: install apt package
-        ansible_distribution_version is version('22.04', '<=')
+  become: true
-  include_tasks: Debian-old.yaml
+  apt:
-
+    name: fzf
-- when: not (ansible_distribution == 'Ubuntu' and
+    state: latest
-             ansible_distribution_version is version('22.04', '<='))
-  include_tasks: Debian-apt.yaml

roles/fzf/tasks/RedHat.yaml

@@ -1,6 +0,0 @@
----
-- name: install yum package
-  become: true
-  yum:
-    name: fzf
-    state: latest

roles/gdb/RedHat.yaml

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

roles/gh/tasks/Darwin.yaml

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

roles/gh/tasks/Debian.yaml

@@ -1,37 +0,0 @@
----
-- set_fact:
-    arch_map:
-      aarch64: arm64
-      armv6l: armhf
-      armv7l: armhf
-      i386: i386
-      x86_64: amd64
-- set_fact:
-    arch: '{{ [ansible_architecture] | map("extract", arch_map) | first }}'
-
-- name: download apt repository key
-  become: true
-  get_url:
-    url: https://cli.github.com/packages/githubcli-archive-keyring.gpg
-    dest: /usr/share/keyrings/githubcli-archive-keyring.gpg
-    mode: 0644
-
-- name: add apt repository list
-  become: true
-  apt_repository:
-    filename: github-cli
-    repo: 'deb [arch={{arch}} signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main'
-    state: present
-
-- name: install apt package
-  become: true
-  apt:
-    name: gh
-    state: latest
-    update_cache: true
-  register: gh_apt
-
-- name: install zsh completions
-  when: gh_apt.changed
-  become: true
-  shell: gh completion -s zsh > /usr/local/share/zsh/site-functions/_gh

roles/gh/tasks/RedHat.yaml

@@ -1,12 +0,0 @@
----
-- name: add yum repository
-  become: true
-  get_url:
-    url: https://cli.github.com/packages/rpm/gh-cli.repo
-    dest: /etc/yum.repos.d/gh-cli.repo
-
-- name: install dnf package
-  become: true
-  dnf:
-    name: gh
-    state: latest

roles/git/tasks/unix.yaml

@@ -18,4 +18,8 @@
     extra_args: --user
     state: latest
 
-- include_tasks: ~/.config/git/tasks.yaml
+- name: create symbolic links
+  file:
+    state: link
+    src: ~/.config/git/_git-changes
+    dest: ~/.local/share/zsh/site-functions/_git-changes

roles/glab/tasks/Darwin.yaml

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

roles/glab/tasks/Debian.yaml

@@ -1,67 +0,0 @@
----
-- set_fact:
-    glab: /usr/bin/glab
-- name: stat the executable
-  stat:
-    path: '{{glab}}'
-  register: stat_glab
-
-- name: get instlal version
-  when: stat_glab.stat.exists
-  command: '{{glab}} --version'
-  register: glab_version_output
-  changed_when: false
-
-- when: stat_glab.stat.exists
-  set_fact:
-    glab_version: '{{glab_version_output.stdout | replace("glab version ", "v")}}'
-
-- set_fact:
-    gitlab_api: 'https://gitlab.com/api/v4'
-    project_id: 'gitlab-org%2Fcli'
-
-- name: get list of gitlab releases
-  uri:
-    url:
-      '{{gitlab_api}}/projects/{{project_id}}/releases'
-  register: releases
-
-- set_fact:
-    latest: '{{releases.json[0]}}'
-    latest_version: '{{releases.json[0].tag_name}}'
-    query: >
-      [?contains(name, `glab`)] |
-      [?contains(name, `Linux`)] |
-      [?contains(name, `{{ansible_machine}}.deb`)] | [0]
-- set_fact:
-    asset: '{{latest.assets.links|json_query(query)}}'
-
-- name: create download directory
-  when: glab_version is not defined or glab_version != latest_version
-  tempfile:
-    state: directory
-    suffix: glab
-  register: tempdir
-
-- name: download .deb file
-  when: glab_version is not defined or glab_version != latest_version
-  get_url:
-    url: '{{asset.url}}'
-    dest: '{{tempdir.path}}/glab.deb'
-
-- name: install .deb file
-  when: glab_version is not defined or glab_version != latest_version
-  become: true
-  apt:
-    deb: '{{tempdir.path}}/glab.deb'
-
-- name: remove download directory
-  when: glab_version is not defined or glab_version != latest_version
-  file:
-    state: absent
-    path: '{{tempdir.path}}'
-
-- name: install zsh completions
-  when: glab_version is not defined or glab_version != latest_version
-  command:
-    glab completion -s zsh > ~/.local/share/zsh/site-functions/_glab

roles/glab/tasks/RedHat.yaml

@@ -1,6 +0,0 @@
----
-- name: install dnf package
-  become: true
-  dnf:
-    name: glab
-    state: latest

roles/glab/tasks/Windows.yaml

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

roles/glab/tasks/main.yaml

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

roles/htop/tasks/RedHat.yaml

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

roles/iterm/tasks/main.yaml

@@ -1,10 +0,0 @@
----
-- assert:
-    that: ansible_os_family == "Darwin"
-
-- name: install homebrew package
-  homebrew_cask:
-    name: iterm2
-    state: latest
-
-# TODO: Configure stuff, somehow?

roles/jp/tasks/Darwin.yaml

@@ -4,12 +4,9 @@
     url: https://api.github.com/repos/jmespath/jp/releases/latest
   register: latest
 
+# TODO: Support arm64
 - set_fact:
-    arch: '{{ [ansible_architecture] |
+    asset_query: '[?contains(name, `jp-darwin-amd64`)] | [0]'
-      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'
@@ -17,7 +14,7 @@
 - name: check if already installed
   stat:
     path: '{{jp_exe}}'
-  register: jp_stat
+  register: jp_exe
 
 - name: get installed version
   when: jp_stat.stat.exists == True

roles/jp/tasks/RedHat.yaml

@@ -1,51 +0,0 @@
----
-- name: stat executable
-  stat:
-    path: '{{ansible_env.HOME}}/.local/bin/jp'
-  register: jp_stat
-
-- name: get installed version
-  when: jp_stat.stat.exists
-  command: jp --version
-  changed_when: false
-  register: jp_version
-
-- name: extract installed version
-  when: jp_stat.stat.exists
-  set_fact:
-    jp_installed_version:
-      '{{jp_version.stdout.strip() | regex_replace("^.*(\d+\.\d+\.\d+).*$", "\1")}}'
-
-- name: get latest release
-  uri:
-    url: 'https://api.github.com/repos/jmespath/jp/releases/latest'
-  register: latest
-
-- name: determine if jp needs installed
-  set_fact:
-    jp_needs_installed:
-      '{{not jp_stat.stat.exists or jp_installed_version != latest.json.tag_name}}'
-    arch_dict: {x86_64: amd64, arm64: arm64}
-
-- name: select asset name
-  when: jp_needs_installed
-  set_fact:
-    asset_query:
-      '[?contains(name, `jp-linux-{{arch_dict[ansible_architecture]}}`)] | [0]'
-- name: select asset
-  when: jp_needs_installed
-  set_fact:
-    asset: '{{latest.json.assets | to_json | from_json | json_query(asset_query)}}'
-
-- name: create directory
-  when: jp_needs_installed
-  file:
-    path: '{{ansible_env.HOME}}/.local/bin'
-    state: directory
-
-- name: install executable
-  when: jp_needs_installed
-  get_url:
-    url: '{{asset.browser_download_url}}'
-    dest: '{{ansible_env.HOME}}/.local/bin/jp'
-    mode: '0755'

roles/jq/tasks/Debian.yaml

@@ -1,6 +1,5 @@
 ---
 - name: install apt package
-  become: true
   apt:
     name: jq
     state: latest

roles/jq/tasks/RedHat.yaml

@@ -1,6 +0,0 @@
----
-- name: install dnf package
-  become: true
-  dnf:
-    name: jq
-    state: latest

roles/llvm/tasks/Fedora.yaml

@@ -1,10 +0,0 @@
----
-- name: install dnf packages
-  become: true
-  dnf:
-    name:
-      - clang
-      - clang-tools-extra
-      - git-clang-format
-      - llvm
-    state: latest

roles/llvm/tasks/Linux Mint.yaml

@@ -1,2 +0,0 @@
----
-- include_tasks: Ubuntu.yaml

roles/llvm/tasks/Pop!_OS.yaml

@@ -1,2 +0,0 @@
----
-- include_tasks: Ubuntu.yaml

roles/llvm/tasks/Ubuntu.yaml

@@ -4,27 +4,14 @@
     url: https://api.github.com/repos/llvm/llvm-project/releases/latest
   register: llvm_latest
 
-- name: read /etc/os-release
-  slurp:
-    src: /etc/os-release
-  register: os_release_b64
-- name: extract UBUNTU_CODENAME=<name> to support dirivitive distros
-  set_fact:
-    ubuntu_codename: >-
-      {{
-          os_release_b64.content | b64decode |
-          regex_search('UBUNTU_CODENAME=.*') |
-          replace('UBUNTU_CODENAME=', '')
-      }}
-
 - 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/{{ubuntu_codename}}/'
+      'http://apt.llvm.org/{{ansible_distribution_release}}/'
     llvm_apt_category:
-      'llvm-toolchain-{{ubuntu_codename}}-{{llvm_major_version}}'
+      'llvm-toolchain-{{ansible_distribution_release}}-{{llvm_major_version}}'
 
 - name: add upstream deb repository
   become: true

roles/magnet/tasks/main.yaml

@@ -1,8 +0,0 @@
----
-- assert:
-    that: ansible_os_family == 'Darwin'
-
-- name: install app store package
-  mas:
-    id: 441258766
-    state: latest

roles/mas/tasks/main.yaml

@@ -1,8 +0,0 @@
----
-- assert:
-    that: ansible_os_family == 'Darwin'
-
-- name: install homebrew package
-  homebrew:
-    name: mas
-    state: latest

roles/microsoft-remote-desktop/tasks/main.yaml

@@ -1,8 +0,0 @@
----
-- assert:
-    that: ansible_os_family == "Darwin"
-
-- name: install homebrew cask
-  homebrew_cask:
-    name: microsoft-remote-desktop
-    state: latest

roles/moonlight/tasks/Windows.yaml

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

roles/neovim/tasks/Darwin.yaml

@@ -1,11 +1,7 @@
 ---
 - name: install homebrew packages
   homebrew:
-    name:
+    name: neovim
-      - neovim
     state: latest
 
-- set_fact:
-    neovim_pip_packages: '{{neovim_pip_packages + ["pynvim"]}}'
-
 - include_tasks: Unix.yaml

roles/neovim/tasks/Debian.yaml

@@ -1,18 +1,8 @@
 ---
-- name: add neovim stable ppa
-  when: ansible_distribution == 'Ubuntu' and
-        ansible_distribution_version == '20.04'
-  become: true
-  apt_repository:
-    repo: ppa:neovim-ppa/stable
-    update_cache: true
-
 - name: install apt package
   become: true
   apt:
-    name:
+    name: neovim
-      - neovim
-      - python3-neovim
     state: latest
 
 - include_tasks: Unix.yaml

roles/neovim/tasks/RedHat.yaml

@@ -1,10 +0,0 @@
----
-- name: install dnf package
-  become: true
-  dnf:
-    name:
-      - neovim
-      - python3-neovim
-    state: latest
-
-- include_tasks: Unix.yaml

roles/neovim/tasks/Unix.yaml

@@ -8,6 +8,8 @@
     dest: '{{vim_config_dir}}'
     version: master
 
+# TODO: - name: set repo email
+
 - name: install pip packages
   pip:
     name: '{{neovim_pip_packages}}'

roles/neovim/vars/main.yaml

@@ -3,5 +3,6 @@ neovim_pip_packages:
   - cmake-language-server
   - cmakelint
   - compdb
+  - pynvim
   - vim-vint
   - yamllint

roles/nodejs/tasks/RedHat.yaml

@@ -1,6 +0,0 @@
----
-- name: install yum package
-  become: true
-  yum:
-    name: nodejs
-    state: latest

roles/obsidian/handlers/main.yaml

@@ -1,5 +0,0 @@
----
-- name: install desktop menu
-  command: >
-    xdg-desktop-menu install --mode user
-      {{ansible_env.HOME}}/.local/share/applications/obsidian-obsidian.desktop

roles/obsidian/tasks/Darwin.yaml

@@ -1,7 +1,11 @@
 ---
 - name: install homebrew package
-  homebrew_cask:
+  homebrew:
     name: obsidian
     state: latest
 
-- include_tasks: Unix.yaml
+- name: clone notes repository
+  git:
+    repo: git@github.com:kbenzie/notes.git
+    dest: '{{ansible_env.HOME}}/Documents/Notes'
+    branch: main

roles/obsidian/tasks/RedHat.yaml

@@ -1,48 +0,0 @@
----
-- name: stat symlink
-  stat:
-    path: '{{ansible_env.HOME}}/.local/bin/Obsidian'
-  register: symlink_file
-
-- name: get latest release
-  uri:
-    url: https://api.github.com/repos/obsidianmd/obsidian-releases/releases/latest
-  register: latest
-
-- set_fact:
-    appimage: 'Obsidian-{{latest.json.name}}.AppImage'
-- set_fact:
-    filepath: '{{ansible_env.HOME}}/.local/bin/{{appimage}}'
-    asset_query: '[?contains(name, `{{appimage}}`)] | [0]'
-- set_fact:
-    needs_installed:
-      '{{not symlink_file.stat.exists or symlink_file.stat.lnk_source != filepath}}'
-    asset: '{{latest.json.assets | to_json | from_json | json_query(asset_query)}}'
-
-- name: download latest version
-  get_url:
-    url: '{{asset.browser_download_url}}'
-    dest: '{{filepath}}'
-    mode: '0755'
-
-- name: create symlink
-  file:
-    src: '{{filepath}}'
-    dest: '{{ansible_env.HOME}}/.local/bin/Obsidian'
-    state: link
-
-# TODO: icon for desktop file
-
-- name: create desktop file
-  template:
-    src: obsidian.desktop.j2
-    dest: '{{ansible_env.HOME}}/.local/share/applications/obsidian-obsidian.desktop'
-  notify: install desktop menu
-
-- name: remove old appimage
-  when: needs_installed and symlink_file.stat.exists
-  file:
-    path: '{{symlink_file.stat.lnk_source}}'
-    state: absent
-
-- include_tasks: Unix.yaml

roles/obsidian/tasks/Unix.yaml

@@ -1,6 +0,0 @@
----
-- name: clone notes repository
-  git:
-    repo: git@github.com:kbenzie/notes.git
-    dest: '{{ansible_env.HOME}}/Documents/Notes'
-    version: main

roles/obsidian/templates/obsidian.desktop.j2

@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Obsidian
-Exec={{ansible_env.HOME}}/.local/bin/Obsidian
-Terminal=false
-Type=Application
-Icon=obsidian
-StartupWMClass=Obsidian
-X-AppImage-Version={{latest.json.name}}
-Comment=Private and flexible note‑taking app that adapts to the way you think. 
-MimeType=x-scheme-handler/obsidian;
-Categories=Utility;

roles/prusaslicer/tasks/main.yaml

@@ -6,9 +6,3 @@
   win_chocolatey:
     name: prusaslicer
     state: latest
-
-- name: create start menu shortcut
-  win_shortcut:
-    src: '{{ansible_env.ProgramData}}/chocolatey/bin/prusa-slicer.exe'
-    dest: '{{ansible_env.ProgramData}}/Microsoft/Windows/Start Menu/Programs/PrusaSlicer.lnk'
-    icon: '{{ansible_env.ProgramData}}/chocolatey/bin/prusa-slicer.exe,0'

roles/python/tasks/Debian.yaml

@@ -8,4 +8,3 @@
       - python3-pip
       - python3-venv
       - python3-virtualenv
-    state: latest

roles/python/tasks/RedHat.yaml

@@ -1,9 +0,0 @@
----
-- name: install yum packages
-  become: true
-  yum:
-    name:
-      - python3
-      - python3-pip
-      - python3-virtualenv
-    state: latest

roles/python/tasks/main.yaml

@@ -1,5 +1,5 @@
 ---
 - include_tasks: '{{ansible_os_family}}.yaml'
 
-- include_tasks: 'Unix.yaml'
+- include_tasks: 'unix.yaml'
   when: ansible_os_family != "Windows"

roles/python/tasks/unix.yaml

@@ -6,33 +6,6 @@
 
 # TODO: set repo email
 
-- name: create config directories
-  file:
-    state: directory
-    path: '{{item}}'
-  with_items:
-    - ~/.config
-    - ~/.config/ipython/profile_default
-    - ~/.config/pip
-
-# Ensure that pip.conf exists before ever installing pip packages since
-# Debian has enabled `EXTERNALLY-MANAGED` from PEP 668 which breaks `pip
-# install --user` unless configured otherwise.
-- name: create symbolic links
-  file:
-    state: link
-    src: '{{item.src}}'
-    dest: '{{item.dest}}'
-  with_items:
-    - src: ~/.config/python/flake8
-      dest: ~/.config/flake8
-    - src: ~/.config/python/pylintrc
-      dest: ~/.pylintrc
-    - src: ~/.config/python/ipython_config.py
-      dest: ~/.config/ipython/profile_default/ipython_config.py
-    - src: ~/.config/python/pip.conf
-      dest: ~/.config/pip/pip.conf
-
 - name: install pip packages
   pip:
     name: '{{python_pip_packages}}'
@@ -46,3 +19,18 @@
   with_items:
     - ~/.config/ipython/profile_default
     - ~/.config/pip
+
+- name: create symbolic links
+  file:
+    state: link
+    src: '{{item.src}}'
+    dest: '{{item.dest}}'
+  with_items:
+    - src: ~/.config/python/flake8
+      dest: ~/.config/flake8
+    - src: ~/.config/python/pylintrc
+      dest: ~/.pylintrc
+    - src: ~/.config/python/ipython_config.py
+      dest: ~/.config/ipython/profile_default/ipython_config.py
+    - src: ~/.config/python/pip.conf
+      dest: ~/.config/pip/pip.conf

roles/python/vars/main.yaml

@@ -5,7 +5,6 @@ python_pip_packages:
   - ipdb
   - ipython
   - isort
-  - jmespath
   - pylint
   - python-gist
   - yapf

roles/sudo/tasks/main.yaml

@@ -2,13 +2,11 @@
 - assert:
     that: ansible_user_id != "root"
 
-- include_vars: '{{ansible_os_family}}.yaml'
-
 - name: create /etc/sudoers.d/{user} config file
   become: true
   template:
     src: sudoers
     dest: '/etc/sudoers.d/{{ansible_user_id}}'
-    owner: '{{sudo_owner}}'
+    owner: root
-    group: '{{sudo_group}}'
+    group: root
     mode: '0440'

roles/sudo/vars/Darwin.yaml

@@ -1,3 +0,0 @@
----
-sudo_owner: root
-sudo_group: wheel

roles/sudo/vars/Debian.yaml

@@ -1,3 +0,0 @@
----
-sudo_owner: root
-sudo_group: root

roles/sudo/vars/RedHat.yaml

@@ -1,3 +0,0 @@
----
-sudo_owner: root
-sudo_group: wheel

roles/system-info/handlers/main.yaml

@@ -1,7 +0,0 @@
----
-- name: restart system-info
-  systemd:
-    name: system-info
-    scope: user
-    daemon_reload: true
-    state: restarted

roles/system-info/tasks/Debian.yaml

@@ -3,10 +3,23 @@
   become: true
   apt:
     name:
-      - acpi
       - gawk
-      - lm-sensors
       - sysstat
     state: latest
 
-- include_tasks: Linux.yaml
+- 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/system-info/tasks/Linux.yaml

@@ -1,28 +0,0 @@
----
-- name: create systemd user unit directory
-  file:
-    state: directory
-    dest: ~/.config/systemd/user
-
-- set_fact:
-    SYSTEM_INFO_SCRIPT_DIR: '{{ansible_env.HOME}}/.config/tmux/system-info'
-
-- when: '"WSL" not in ansible_kernel'
-  set_fact:
-    SYSTEM_INFO_SCRIPT: '{{SYSTEM_INFO_SCRIPT_DIR}}/system-info-Linux.sh'
-- when: '"WSL" in ansible_kernel'
-  set_fact:
-    SYSTEM_INFO_SCRIPT: '{{SYSTEM_INFO_SCRIPT_DIR}}/system-info-WSL.sh'
-
-- name: install system-info systemd unit
-  template:
-    src: templates/system-info.service.j2
-    dest: ~/.config/systemd/user/system-info.service
-  notify: restart system-info
-
-- name: enable system-info service
-  systemd:
-    name: system-info
-    scope: user
-    enabled: true
-    state: started

roles/system-info/tasks/RedHat.yaml

@@ -1,11 +0,0 @@
----
-- name: install dnf packages
-  become: true
-  dnf:
-    name:
-      - acpi
-      - lm_sensors
-      - sysstat
-    state: latest
-
-- include_tasks: Linux.yaml

roles/system-info/tasks/Windows.yaml

@@ -30,29 +30,29 @@
     start_when_available: true
     wake_to_run: false
 
-# - name: create system-info-WSL.sh scheduled task
+- name: create system-info-WSL.sh scheduled task
-#   win_scheduled_task:
+  win_scheduled_task:
-#     path: Benie
+    path: Benie
-#     name: system-info-WSL.sh
+    name: system-info-WSL.sh
-#     state: present
+    state: present
-#     enable: true
+    enable: true
-#     triggers:
+    triggers:
-#       - type: logon
+      - type: logon
-#         enabled: true
+        enabled: true
-#       - type: registration
+      - type: registration
-#         enabled: true
+        enabled: true
-#     actions:
+    actions:
-#       - path: '{{wsl_exe}}'
+      - path: '{{wsl_exe}}'
-#         arguments: '-d Debian -e /home/benie/.config/tmux/system-info/system-info-WSL.sh'
+        arguments: '-d Debian -e /home/benie/.config/tmux/system-info/system-info-WSL.sh'
-#     disallow_start_if_on_batteries: false
+    disallow_start_if_on_batteries: false
-#     stop_if_going_on_batteries: false
+    stop_if_going_on_batteries: false
-#     execution_time_limit: PT0S
+    execution_time_limit: PT0S
-#     logon_type: password
+    logon_type: password
-#     username: '{{ansible_user}}'
+    username: '{{ansible_user}}'
-#     password: '{{ansible_password}}'
+    password: '{{ansible_password}}'
-#     multiple_instances: 3
+    multiple_instances: 3
-#     run_level: limited
+    run_level: limited
-#     start_when_available: true
+    start_when_available: true
-#     wake_to_run: false
+    wake_to_run: false
 
 # - TODO: configure firewall

roles/system-info/templates/system-info.service.j2

@@ -1,9 +0,0 @@
-[Unit]
-Description=System Info
-
-[Service]
-ExecStart={{SYSTEM_INFO_SCRIPT}}
-Environment=LC_ALL=C.UTF-8
-
-[Install]
-WantedBy=default.target

roles/tidy/tasks/RedHat.yaml

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

roles/tmux/tasks/Archlinux.yaml

@@ -3,21 +3,6 @@
   pacman:
     name:
       - tmux
+      - xclip
       - urlscan
     state: latest
-
-- name: install pacman package
-  when: '"WSL" not in ansible_kernel'
-  become: true
-  pacman:
-    name: xsel
-    state: latest
-
-- name: remove pacman package
-  when: '"WSL" in ansible_kernel'
-  become: true
-  pacman:
-    name:
-      - xclip
-      - xsel
-    state: absent

roles/tmux/tasks/Darwin.yaml

@@ -3,34 +3,7 @@
   homebrew:
     name:
       - tmux
+      - osx-cpu-temp
       - reattach-to-user-namespace
       - urlview
     state: latest
-
-- name: check terminal info description exists
-  command: /usr/bin/infocmp -x tmux-256color
-  changed_when: false
-  failed_when: false
-  register: terminfo_exists
-
-- name: download latest terminfo description
-  when: terminfo_exists.rc == 1
-  get_url:
-    url: https://gist.githubusercontent.com/nicm/ea9cf3c93f22e0246ec858122d9abea1/raw/37ae29fc86e88b48dbc8a674478ad3e7a009f357/tmux-256color
-    dest: ~/tmux-256color
-
-- name: compile terminal info
-  when: terminfo_exists.rc == 1
-  command: /usr/bin/tic -x ~/tmux-256color
-
-- name: cleanup downloaded terminfo description
-  when: terminfo_exists.rc == 1
-  file:
-    path: ~/tmux-256color
-    state: absent
-
-- name: check terminal info description exists
-  when: terminfo_exists.rc == 1
-  command: /usr/bin/infocmp -x tmux-256color
-  changed_when: false
-  register: terminfo_exists

roles/tmux/tasks/Debian.yaml

@@ -1,26 +1,12 @@
 ---
 - name: install apt packages
   become: true
-  apt:
+  package:
     name:
       - tmux
       - gawk
+      - jq
       - sysstat
       - urlview
-    state: latest
-
-- name: install apt package
-  when: '"WSL" not in ansible_kernel'
-  become: true
-  apt:
-    name: xsel
-    state: latest
-
-- name: remove apt package
-  when: '"WSL" in ansible_kernel'
-  become: true
-  apt:
-    name:
       - xclip
-      - xsel
+    state: latest
-    state: absent

roles/tmux/tasks/Fedora.yaml

@@ -3,22 +3,8 @@
   dnf:
     name:
       - tmux
+      - xclip
       - urlscan
       - sysstat
+      - jq
     state: latest
-
-- name: install dnf package
-  when: '"WSL" not in ansible_kernel'
-  become: true
-  dnf:
-    name: xsel
-    state: latest
-
-- name: remove dnf package
-  when: '"WSL" in ansible_kernel'
-  become: true
-  dnf:
-    name:
-      - xclip
-      - xsel
-    state: absent

roles/tmux/tasks/RedHat.yaml

@@ -1,10 +0,0 @@
----
-- name: install yum packages
-  become: true
-  yum:
-    name:
-      - tmux
-      - sysstat
-      - urlview
-      - xsel
-    state: latest

roles/tree/tasks/RedHat.yaml

@@ -1,6 +0,0 @@
----
-- name: install dnf package
-  become: true
-  dnf:
-    name: tree
-    state: latest

roles/ulauncher/tasks/main.yaml

@@ -1,4 +0,0 @@
----
-# TODO: Install ulauncher - or find a better alternative
-# TODO: If gnome-shell on wayland set global key binding in custom keyboard settings
-# TODO: Clone https://github.com/shepda/ulauncher-adwaita-darkish into ~/.config/ulauncher/user-themes

roles/viscosity/tasks/main.yaml

@@ -1,8 +0,0 @@
----
-- assert:
-    that: ansible_os_family == "Darwin"
-
-- name: install homebrew package
-  homebrew_cask:
-    name: viscosity
-    state: latest

roles/watch/tasks/main.yaml

@@ -1,6 +0,0 @@
----
-- name: install homebrew package
-  when: ansible_os_family == "Darwin"
-  homebrew:
-    name: watch
-    state: latest

roles/webcatalog/handlers/main.yaml

@@ -1,5 +0,0 @@
----
-- name: install desktop menu
-  command: >
-    xdg-desktop-menu install --mode user
-      {{ansible_env.HOME}}/.local/share/applications/webcatalog-webcatalog.desktop

roles/webcatalog/tasks/Darwin.yaml

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

roles/webcatalog/tasks/Linux.yaml

@@ -1,49 +0,0 @@
----
-- name: stat symlink
-  stat:
-    path: '{{ansible_env.HOME}}/.local/bin/WebCatalog'
-  register: symlink_file
-
-- name: get releases
-  uri:
-    url: https://raw.githubusercontent.com/kbenzie/webcatalog-release-scraper/main/webcatalog-releases.json
-    return_content: true
-  register: releases_raw
-
-- set_fact:
-    releases: '{{releases_raw.content | from_json}}'
-- set_fact:
-    appimage: 'WebCatalog-{{releases[0].version}}.AppImage'
-- set_fact:
-    filepath: '{{ansible_env.HOME}}/.local/bin/{{appimage}}'
-
-- set_fact:
-    needs_installed:
-      '{{not symlink_file.stat.exists or symlink_file.stat.lnk_source != filepath}}'
-
-- name: download latest version
-  when: needs_installed
-  get_url:
-    url: 'https://cdn-2.webcatalog.io/webcatalog/{{appimage}}'
-    dest: '{{ansible_env.HOME}}/.local/bin/{{appimage}}'
-    mode: '0755'
-
-- name: create symlink
-  file:
-    src: '{{filepath}}'
-    dest: '{{ansible_env.HOME}}/.local/bin/WebCatalog'
-    state: link
-
-# TODO: icon for desktop file
-
-- name: create desktop file
-  template:
-    src: webcatalog.desktop.j2
-    dest: '{{ansible_env.HOME}}/.local/share/applications/webcatalog-webcatalog.desktop'
-  notify: install desktop menu
-
-- name: remove old appimage
-  when: needs_installed and symlink_file.stat.exists
-  file:
-    path: '{{symlink_file.stat.lnk_source}}'
-    state: absent

roles/webcatalog/tasks/main.yaml

@@ -1,7 +0,0 @@
----
-- when: ansible_os_family == 'Darwin'
-  include_tasks: 'Darwin.yaml'
-- when: ansible_os_family == 'Windows'
-  include_tasks: 'Windows.yaml'
-- when: ansible_os_family != 'Darwin' and ansible_os_family != 'Windows'
-  include_tasks: 'Linux.yaml'

roles/webcatalog/templates/webcatalog.desktop.j2

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

roles/wget/tasks/Debian.yaml

@@ -1,6 +1,5 @@
 ---
 - name: install apt package
-  become: true
   apt:
     name: wget
     state: latest