Add RedHat support to 1password role

.gitignore

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

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/UnixCLI.yaml

@@ -8,25 +8,26 @@
     - 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: watch
 
     - role: llvm
     - role: nodejs
+
+    - role: wsl
+      when: '"WSL" in ansible_kernel'

playbooks/UnixGUI.yaml

@@ -1,7 +1,5 @@
 ---
+- import_playbook: UnixCLI.yaml
 - hosts: localhost
   roles:
     - role: 1password
-    - role: fonts
-    - role: obsidian
-    - role: webcatalog

playbooks/WSL.yaml

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

playbooks/macOS.yaml

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

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

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

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/fonts/handlers/main.yaml

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

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 +1,2 @@
 ---
-- when: ansible_os_family == 'Darwin'
+- include_tasks: '{{ansible_os_family}}.yaml'
-  include_tasks: 'Darwin.yaml'
-- when: ansible_os_family != 'Darwin' and ansible_os_family != 'Windows'
-  include_tasks: 'Linux.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/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/glab/tasks/RedHat.yaml

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

roles/htop/tasks/RedHat.yaml

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

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/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/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

@@ -10,9 +10,7 @@
 - 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

@@ -4,4 +4,8 @@
     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'
+    version: 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/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/sudo/vars/RedHat.yaml

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

roles/system-info/tasks/Debian.yaml

@@ -3,10 +3,34 @@
   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
+
+- 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/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/tidy/tasks/RedHat.yaml

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

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/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 +1,8 @@
 ---
-- when: ansible_os_family == 'Darwin'
+- assert:
-  include_tasks: 'Darwin.yaml'
+    that: ansible_os_family == "Darwin"
-- when: ansible_os_family == 'Windows'
+
-  include_tasks: 'Windows.yaml'
+- name: install homebrew package
-- when: ansible_os_family != 'Darwin' and ansible_os_family != 'Windows'
+  homebrew_cask:
-  include_tasks: 'Linux.yaml'
+    name: webcatalog
+    state: latest

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

roles/wget/tasks/RedHat.yaml

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

roles/yq/tasks/RedHat.yaml

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

roles/zsh/tasks/RedHat.yaml

@@ -1,8 +0,0 @@
----
-- name: install yum packages
-  become: true
-  yum:
-    name:
-      - zsh
-      - pinentry-tty
-    state: latest