Add rpmfusion role on Fedora

Cider is a cross-platform Apple Music client. Don't bother installing
Cider on macOS since there is the first party Music app.

.gitignore

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

ansible.cfg

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

library/win_git.ps1

@@ -0,0 +1,232 @@
+#!powershell
+
+#AnsibleRequires -CSharpUtil Ansible.Basic
+#AnsibleRequires -PowerShell Ansible.ModuleUtils.CommandUtil
+
+$module = [Ansible.Basic.AnsibleModule]::Create($args, @{
+    options = @{
+        dest = @{type = 'path'}
+        repo = @{required = $true; aliases = @('name')}
+        version = @{default = 'HEAD'; aliases = @('branch')}
+        remote = @{default = 'origin'}
+        recursive = @{default = $true; type = 'bool'}
+        executable = @{default = $null; type = 'path'}
+    }
+    supports_check_mode = $false
+})
+
+$dest = $module.Params.dest
+$repo = $module.Params.repo
+$version = $module.Params.version
+$remote = $module.Params.remote
+$git = $module.Params.executable
+if (!$git) {
+    $git = Get-ExecutablePath 'git'
+}
+
+# ================================= Utilities ==================================
+
+function Get-AbsolutePath {
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory = $true)] [String] $path
+    )
+    try {
+        $result = Resolve-Path $path
+    } catch {
+        return $_[0].TargetObject
+    }
+    return $result
+}
+
+function Get-GitDir {
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory = $true)] [String] $path
+    )
+    $git_dir = Join-Path $path '.git'
+    # Check if this .git is a file.
+    if ([System.IO.File]::Exists($git_dir)) {
+        # Extract the gitdir: path from the .git file.
+        $groups = Get-Content "$git_dir" | `
+            Select-String '(gitdir:) (.*)' | `
+            ForEach { $_.Matches[0].Groups[1..2] }
+        $ref_prefix = $groups[0]
+        $gitdir = $groups[1]
+        if ($ref_prefix -ne 'gitdir:') {
+            $module.FailJson('The .git file has invalid gitdir reference format.')
+        }
+        # Check if the repo path is absolute.
+        if ([System.IO.Path]::IsPathRooted($gitdir)) {
+            $git_dir = $gitdir
+        } else {
+            # Join with the input path to construct an absolute path.
+            $git_dir = Join-Path $path $gitdir
+        }
+        if (![System.IO.Directory]::Exists($git_dir)) {
+            throw "$git_dir is not a directory."
+        }
+    }
+    return $git_dir
+}
+
+function Test-GitLocalChanges {
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory = $true)] [String] $dest
+    )
+    $command = "`"$git`" status --porcelain"
+    $result = Run-Command -command $command -working_directory $dest
+    $changes = $result.stdout.Split([System.Environment]::NewLine, `
+            [System.StringSplitOptions]::RemoveEmptyEntries) | `
+        Where-Object { -not $_.StartsWith('??') } | Measure-Object -Line
+    return $changes.Lines -gt 0
+}
+
+function Get-GitRemoteHeadBranch {
+    [CmdletBinding()]
+    Param (
+        [Parameter(Mandatory = $true)] [String] $dest,
+        [Parameter(Mandatory = $true)] [String] $remote
+    )
+    $command = "`"$git`" symbolic-ref --short refs/remotes/$remote/HEAD"
+    $result = Run-Command -command $command -working_directory $dest
+    if ($result.rc -ne 0) {
+        $module.FailJson("Could not determine the default HEAD branch of remote: $remote" ` +
+                         "$result.stdout $result.stderr")
+    }
+    return $result.stdout.Trim().Replace("$remote/", '')
+}
+
+function Get-GitCurrentSha {
+    [CmdletBinding()]
+    Param (
+        [Parameter(Mandatory = $true)] [String] $dest
+    )
+    $command = "`"$git`" rev-parse HEAD"
+    $result = Run-Command -command $command -working_directory $dest
+    return $result.stdout.Trim()
+}
+
+function Invoke-GitClone {
+    [CmdletBinding()]
+    Param (
+        [Parameter(Mandatory = $true)] [String] $repo,
+        [Parameter(Mandatory = $true)] [String] $remote,
+        [Parameter(Mandatory = $true)] [String] $dest
+    )
+    $dest_parent = Split-Path -Path $dest -Parent
+    if (!(Test-Path $dest_parent)) {
+        New-Item -Path $dest_parent -ItemType Directory
+    }
+    $command = "`"$git`" clone --recursive --origin $remote $repo $dest"
+    if ($version -ne "HEAD") {
+        $command += " --branch $version"
+    }
+    $result = Run-Command -command $command -working_directory $cwd
+    if ($result.rc -ne 0) {
+        $module.FailJson($result.stderr)
+    }
+}
+
+function Invoke-GitCheckout {
+    [CmdletBinding()]
+    Param (
+        [Parameter(Mandatory = $true)] [String] $dest,
+        [Parameter(Mandatory = $true)] [String] $remote,
+        [Parameter(Mandatory = $true)] [String] $version
+    )
+    if ($version -eq "HEAD") {
+        $branch = Get-GitRemoteHeadBranch $dest $remote
+    } else {
+        $branch = $version
+    }
+    $result = Run-Command -command "`"$git`" checkout $branch" -working_directory $dest
+    if ($result.rc -ne 0) {
+        $module.FailJson("Failed to checkout version '$version'`n" + $result.stderr)
+    }
+}
+
+function Invoke-GitFetch {
+    [CmdletBinding()]
+    Param (
+        [Parameter(Mandatory = $true)] [String] $dest,
+        [Parameter(Mandatory = $true)] [String] $remote,
+        [Parameter(Mandatory = $true)] [String] $version
+    )
+    $command = "`"$git`" fetch --tags $remote"
+    $result = Run-Command -command $command -working_directory $dest
+    if ($result.rc -ne 0) {
+        $module.FailJson("Failed to download remote objects and refs:`n" + `
+                         $result.stderr)
+    }
+}
+
+function Invoke-GitPull {
+    [CmdletBinding()]
+    Param (
+        [Parameter(Mandatory = $true)] [String] $dest,
+        [Parameter(Mandatory = $true)] [String] $remote,
+        [Parameter(Mandatory = $true)] [String] $version
+    )
+    $result = Run-Command -command "`"$git`" pull $remote $version" -working_directory $dest
+    if ($result.rc -ne 0) {
+        $module.FailJson("Failed to pull version '$version' from remote '$origin':`n" + `
+                         $result.stderr)
+    }
+}
+
+function Invoke-GitSubmoduleUpdate {
+    [CmdletBinding()]
+    Param (
+        [Parameter(Mandatory = $true)] [String] $dest
+    )
+    $result = Run-Command -command "`"$git`" submodule update --init" -working_directory $dest
+    if ($result.rc -ne 0) {
+        $module.FailJson("Failed to initialized/update submodules:`n" + $result.stderr)
+    }
+}
+
+# ================================ Start logic =================================
+
+if (!$dest) {
+    $module.FailJson('The destination directory must be specified.')
+}
+$dest = Get-AbsolutePath $dest
+$git_dir = Get-GitDir $dest
+$gitconfig = Join-Path $git_dir 'config'
+
+$module.Result.before = $null
+
+if (($dest -and ![System.IO.File]::Exists($gitconfig))) {
+    Invoke-GitClone $repo $remote $dest
+    Invoke-GitCheckout $dest $remote $version
+    $module.Result.changed = $true
+} else {
+    $module.Result.before = Get-GitCurrentSha $dest
+    if (Test-GitLocalChanges $dest) {
+        $module.FailJson('Local modifications exist in repository.')
+    }
+    Invoke-GitFetch $dest $remote $version
+    Invoke-GitCheckout $dest $remote $version
+    Invoke-GitPull $dest $remote $version
+    $module.Result.after = Get-GitCurrentSha $dest
+    if ($module.Result.before -ne $module.Result.after) {
+        $module.Result.changed = $true
+    }
+}
+
+if ($recursive) {
+    Invoke-GitSubmoduleUpdate $dest
+}
+
+# Ensure the repository has the correct owner
+$userName = [System.Security.Principal.WindowsIdentity]::GetCurrent().Name
+$idRef = [System.Security.Principal.NTAccount]::new($userName)
+Get-Item -Force $dest | foreach { `
+    $_ ; $_ | Get-ChildItem -Force -Recurse `
+} | foreach { `
+    $acl = $_ | Get-Acl; $acl.SetOwner($idRef); $_ | Set-Acl -AclObject $acl `
+}
+
+$module.ExitJson()

library/win_git.py

@@ -0,0 +1,64 @@
+# -*- coding: utf-8 -*-
+
+# TODO: copyright
+
+DOCUMENTATION = '''
+---
+module: win_git
+author:
+    - "Kenneth Benzie (Benie)"
+short_description: Deploy software (or files) from git checkouts on Windows
+description:
+    - Manage git checkouts of repositories to deploy files or software on Windows.
+options:
+    data:
+        description:
+            - Alternate data to return instead of 'pong'.
+            - If this parameter is set to C(crash), the module will cause an
+              exception.
+        type: str
+        default: pong
+seealso:
+    - module: ansible.builtin.git
+'''
+
+# DOCUMENTATION = r'''
+# ---
+# module: win_ping
+# short_description: A windows version of the classic ping module
+# description:
+#   - Checks management connectivity of a windows host.
+#   - This is NOT ICMP ping, this is just a trivial test module.
+#   - For non-Windows targets, use the M(ansible.builtin.ping) module instead.
+# options:
+#   data:
+#     description:
+#       - Alternate data to return instead of 'pong'.
+#       - If this parameter is set to C(crash), the module will cause an exception.
+#     type: str
+#     default: pong
+# seealso:
+# - module: ansible.builtin.ping
+# author:
+# - Chris Church (@cchurch)
+# '''
+
+EXAMPLES = r'''
+# Test connectivity to a windows host
+# ansible winserver -m ansible.windows.win_ping
+
+- name: Example from an Ansible Playbook
+  ansible.windows.win_ping:
+
+- name: Induce an exception to see what happens
+  ansible.windows.win_ping:
+    data: crash
+'''
+
+RETURN = r'''
+ping:
+    description: Value provided with the data parameter.
+    returned: success
+    type: str
+    sample: pong
+'''

playbooks/Linux.yaml

@@ -3,6 +3,14 @@
 - import_playbook: UnixGUI.yaml
 - hosts: localhost
   roles:
+    - role: cider
+    - role: gnome-tweaks
+      when: "'GNOME' in ansible_env.XDG_CURRENT_DESKTOP and"
     - role: kitty
     - role: xremap
-      when: ansible_os_family == "RedHat"
+      when: >
+        'GNOME' in ansible_env.XDG_CURRENT_DESKTOP and
+        ansible_env.XDG_SESSION_TYPE == 'wayland' and (
+            ansible_os_family == "RedHat" or
+            ansible_os_family == "Debian"
+        )

playbooks/LinuxCLI.yaml

@@ -1,4 +1,8 @@
 ---
+- hosts: localhost
+  roles:
+    - role: rpmfusion
+      when: ansible_os_family == 'RedHat' and ansible_distribution == 'Fedora'
 - import_playbook: UnixCLI.yaml
 - hosts: localhost
   roles:

playbooks/UnixCLI.yaml

@@ -6,8 +6,10 @@
     - role: python
 
     - role: zsh
+      tags: unsafe
     - role: neovim
     - role: tmux
+      tags: unsafe
 
     - role: ag
     - role: bash

playbooks/UnixGUI.yaml

@@ -1,7 +1,10 @@
 ---
 - hosts: localhost
   roles:
+    - role: flatpak
+      when: ansible_os_family != "Darwin"
+
     - role: 1password
+    - role: ferdium
     - role: fonts
     - role: obsidian
-    - role: webcatalog

playbooks/WSL.yaml

@@ -4,3 +4,4 @@
   roles:
     - role: gdb
     - role: wsl
+    - role: system-info

playbooks/Windows.yaml

@@ -23,7 +23,10 @@
 
     - role: 1password
     - role: autohotkey
+    - role: cider
+    - role: ferdium
     - role: firefox
+    - role: fonts
     - role: obsidian
     - role: powertoys
     - role: windows-terminal

playbooks/macOS.yaml

@@ -8,7 +8,11 @@
   roles:
     - role: mas
 
+    - role: hiddenbar
     - role: iterm
+    - role: kitty
     - role: magnet
     - role: microsoft-remote-desktop
     - role: viscosity
+
+    - role: macos

roles/1password/tasks/Debian.yaml

@@ -35,6 +35,11 @@
       https://downloads.1password.com/linux/debian/{{arch}} stable main
     dest: /etc/apt/sources.list.d/1password.list
 
+- name: apt update
+  become: true
+  apt:
+    update_cache: true
+
 - name: install gui package
   when: '"WSL" not in ansible_kernel'
   become: true

roles/1password/tasks/RedHat.yaml

@@ -1,10 +1,10 @@
 ---
-- name: add yum repository key
+- name: add dnf repository key
   become: true
   rpm_key:
     key: https://downloads.1password.com/linux/keys/1password.asc
 
-- name: add yum repository
+- name: add dnf repository
   become: true
   yum_repository:
     name: 1password
@@ -15,8 +15,8 @@
     repo_gpgcheck: true
     gpgkey: ['https://downloads.1password.com/linux/keys/1password.asc']
 
-- name: install yum package
+- name: install dnf package
   become: true
-  yum:
+  dnf:
     name: 1password
     state: latest

roles/1password/tasks/Windows.yaml

@@ -11,36 +11,21 @@
     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
+  when: not app_stat.stat.exists
   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
+  when: not app_stat.stat.exists
   win_command: '{{installer_exe}}'
 
+- name: remove installer
+  win_file:
+    path: '{{installer_exe}}'
+    state: absent
+
 - name: create start menu shortcut
   win_shortcut:
     src: '{{app_exe}}'

roles/ag/tasks/RedHat.yaml

@@ -1,6 +1,6 @@
 ---
-- name: install yum package
+- name: install dnf package
   become: true
-  yum:
+  dnf:
     name: the_silver_searcher
     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/bash/templates/bashrc

@@ -110,3 +110,13 @@ grey="\001\e[38;5;244m\002"
 reset="\001\e[0m\002"
 
 PS1="$yellow\u$reset@$grey\h$reset "
+
+# Setup environment variables
+export PATH=$HOME/.local/bin:$PATH
+if command -v nvim > /dev/null; then
+  export EDITOR=nvim
+elif command -v vim > /dev/null; then
+  export EDITOR=vim
+elif command -v vi > /dev/null; then
+  export EDITOR=vi
+fi

roles/bat/tasks/RedHat.yaml

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

roles/cider/tasks/main.yaml

@@ -0,0 +1,13 @@
+---
+- name: install chocolatey package
+  when: ansible_os_family == 'Windows'
+  win_chocolatey:
+    state: latest
+    name: Cider
+
+- name: install flatpak package
+  when: ansible_os_family != 'Windows' and
+        ansible_os_family != 'Darwin'
+  become: true
+  flatpak:
+    name: sh.cider.Cider

roles/curl/tasks/RedHat.yaml

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

roles/ferdium/tasks/Windows.yaml

@@ -0,0 +1,14 @@
+---
+- name: install chocolatey package
+  win_chocolatey:
+    name: ferdium
+    state: latest
+
+- set_fact:
+    ferdium_exe: 'C:/Program Files/Ferdium/Ferdium.exe'
+
+- name: create start menu shortcut
+  win_shortcut:
+    src: '{{ferdium_exe}}'
+    dest: '{{ansible_env.ProgramData}}/Microsoft/Windows/Start Menu/Programs/Ferdium.lnk'
+    icon: '{{ferdium_exe}},0'

roles/ferdium/tasks/main.yaml

@@ -0,0 +1,16 @@
+---
+- name: install homebrew package
+  when: ansible_os_family == 'Darwin'
+  homebrew_cask:
+    name: ferdium
+    state: latest
+
+- when: ansible_os_family == 'Windows'
+  include_tasks: Windows.yaml
+
+- name: install flatpak package
+  when: ansible_os_family != 'Windows' and
+        ansible_os_family != 'Darwin'
+  become: true
+  flatpak:
+    name: org.ferdium.Ferdium

roles/flatpak/tasks/Debian.yaml

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

roles/flatpak/tasks/RedHat.yaml

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

roles/flatpak/tasks/main.yaml

@@ -0,0 +1,9 @@
+---
+- include_tasks: '{{ansible_os_family}}.yaml'
+
+- name: add flathub repository remote
+  become: true
+  flatpak_remote:
+    name: flathub
+    state: present
+    flatpakrepo_url: https://dl.flathub.org/repo/flathub.flatpakrepo

roles/fonts/tasks/Windows.yaml

@@ -0,0 +1,5 @@
+---
+- name: install chocolatey package
+  win_chocolatey:
+    name: nerd-fonts-CascadiaCode
+    state: latest

roles/fonts/tasks/main.yaml

@@ -1,5 +1,7 @@
 ---
 - 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/fzf/tasks/RedHat.yaml

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

roles/gh/tasks/RedHat.yaml

@@ -1,5 +1,5 @@
 ---
-- name: add yum repository
+- name: add dnf repository
   become: true
   get_url:
     url: https://cli.github.com/packages/rpm/gh-cli.repo

roles/git/tasks/Windows.yaml

@@ -37,11 +37,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/gnome-tweaks/tasks/main.yaml

@@ -0,0 +1,9 @@
+---
+- assert:
+    that: "'GNOME' in ansible_env.XDG_CURRENT_DESKTOP"
+
+- name: install gnome-tweaks
+  become: true
+  package:
+    name: gnome-tweaks
+    state: latest

roles/hiddenbar/tasks/main.yaml

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

roles/kitty/tasks/Darwin.yaml

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

roles/llvm/tasks/Debian.yaml

@@ -1,5 +1,17 @@
 ---
+- name: slurp /etc/os-release
+  slurp:
+    src: /etc/os-release
+  register: os_release_slurp
+- set_fact:
+    os_release: "{{ os_release_slurp.content |
+        b64decode | trim() | replace('=', ': ') | from_yaml }}"
+
+- include_tasks: Ubuntu.yaml
+  when: "'ID_LIKE' in os_release and os_release.ID_LIKE == 'ubuntu debian'"
+
 - name: install apt packages
+  when: "'ID_LIKE' not in os_release"
   become: true
   apt:
     name:

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/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/macos/tasks/main.yaml

@@ -0,0 +1,9 @@
+---
+- assert:
+    that: ansible_os_family == 'Darwin'
+
+- name: disable creation of .DS_Store in directories
+  osx_defaults:
+    domain: com.apple.desktopservices
+    key: DSDontWriteNetworkStores
+    value: 'true'

roles/neovim/tasks/Darwin.yaml

@@ -6,6 +6,12 @@
     state: latest
 
 - set_fact:
-    neovim_pip_packages: '{{neovim_pip_packages + ["pynvim"]}}'
+    neovim_pip_packages: >
+      {{
+          neovim_pip_packages + [
+            "pynvim",
+            "greenlet"
+          ]
+      }}
 
 - include_tasks: Unix.yaml

roles/neovim/tasks/Debian.yaml

@@ -1,10 +1,18 @@
 ---
+- name: slurp /etc/os-release
+  slurp:
+    src: /etc/os-release
+  register: os_release_slurp
+- set_fact:
+    os_release: "{{ os_release_slurp.content |
+        b64decode | trim() | replace('=', ': ') | from_yaml }}"
+
 - name: add neovim stable ppa
-  when: ansible_distribution == 'Ubuntu' and
+  when: "'ID_LIKE' in os_release and os_release.ID_LIKE == 'ubuntu debian'"
-        ansible_distribution_version == '20.04'
   become: true
   apt_repository:
     repo: ppa:neovim-ppa/stable
+    codename: '{{os_release.UBUNTU_CODENAME}}'
     update_cache: true
 
 - name: install apt package

roles/neovim/tasks/Windows-plugins.yaml

@@ -26,6 +26,13 @@
     file_type: directory
   register: found_plugins
 
+- set_fact:
+    backslashes: '\\'
+    forwardslash: '/'
+- set_fact:
+    managed_plugins: "{{managed_plugins | replace(backslashes, forwardslash)}}"
+    found_plugins: "{{found_plugins | replace(backslashes, forwardslash)}}"
+
 - name: remove found plugins which are not in the managed list
   win_file:
     path: '{{item.path}}'

roles/neovim/tasks/Windows.yaml

@@ -13,15 +13,6 @@
     repo: git@code.infektor.net:config/vim.git
     dest: '{{vim_config_dir}}'
     branch: 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:
@@ -50,10 +41,18 @@
     src: '{{vim_config_dir}}/tasks.yaml'
     dest: vim_config_tasks.yaml
     flat: true
+  changed_when: false
 
 - when: config_repo_tasks.stat.exists
   include_tasks: vim_config_tasks.yaml
 
+- name: remove fetched tasks
+  file:
+    state: absent
+    path: vim_config_tasks.yaml
+  changed_when: false
+  delegate_to: localhost
+
 - when: ansible_os_family != "Windows" and
         plugin_dir is defined and plugins is defined
   include_tasks: 'Unix-plugins.yaml'

roles/nodejs/tasks/RedHat.yaml

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

roles/obsidian/tasks/Linux.yaml

@@ -1,75 +1,32 @@
 ---
-# TODO: Prefer Flatpak over AppImage if available
+- name: install flatpak package
+  become: true
+  flatpak:
+    name: md.obsidian.Obsidian
 
-- name: stat symlink
+# Remove old appimage if it exists
+- name: stat appimage 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}}'
     iconpath: 'share/icons/hicolor/512x512/apps/obsidian.png'
-    asset_query: '[?contains(name, `{{appimage}}`)] | [0]'
+- name: remove appimage icon file
-- 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 directories
   file:
-    path: '{{item}}'
-    state: directory
-  with_items:
-    - '{{ansible_env.HOME}}/.local/bin'
-    - '{{ansible_env.HOME}}/.local/share/icons/hicolor/512x512/apps'
-
-- name: create symlink
-  file:
-    src: '{{filepath}}'
-    dest: '{{ansible_env.HOME}}/.local/bin/Obsidian'
-    state: link
-
-- name: extract squashfs-root for app icon
-  when: needs_installed
-  command:
-    cmd: '{{ansible_env.HOME}}/.local/bin/Obsidian --appimage-extract'
-    chdir: '/tmp'
-
-- name: copy icon file
-  when: needs_installed
-  copy:
-    src: '/tmp/squashfs-root/usr/{{iconpath}}'
     dest: '{{ansible_env.HOME}}/.local/{{iconpath}}'
-
-- name: remove squashfs-root directory
-  when: needs_installed
-  file:
-    path: '/tmp/squashfs-root'
     state: absent
-
+- name: remove appimage desktop file
-- name: create desktop file
+  file:
-  template:
-    src: obsidian.desktop.j2
     dest: '{{ansible_env.HOME}}/.local/share/applications/obsidian-obsidian.desktop'
-  notify: install desktop menu
+    state: absent
-
 - name: remove old appimage
-  when: needs_installed and symlink_file.stat.exists
+  when: "'lnk_source' in symlink_file.stat"
   file:
     path: '{{symlink_file.stat.lnk_source}}'
     state: absent
+- name: remove appimage symlink
+  file:
+    path: '{{ansible_env.HOME}}/.local/bin/Obsidian'
+    state: absent
 
 - include_tasks: Unix.yaml

roles/obsidian/tasks/Windows.yaml

@@ -12,7 +12,3 @@
     repo: git@github.com:kbenzie/notes.git
     dest: '{{obsidian_notes_repo}}'
     branch: main
-- win_owner:
-    path: '{{obsidian_notes_repo}}'
-    user: Benie
-    recurse: true

roles/obsidian/templates/obsidian.desktop.j2

@@ -3,7 +3,7 @@ Name=Obsidian
 Exec={{ansible_env.HOME}}/.local/bin/Obsidian
 Terminal=false
 Type=Application
-Icon=obsidian
+Icon={{ansible_env.HOME}}/.local/{{iconpath}}
 StartupWMClass=Obsidian
 X-AppImage-Version={{latest.json.name}}
 Comment=Private and flexible note‑taking app that adapts to the way you think. 

roles/powershell/tasks/main.yaml

@@ -5,13 +5,9 @@
 
 - name: clone config repos
   win_git:
-    repo: git@code.infektor.net:config/WindowsPowerShell.git
+    repo: https://code.infektor.net/config/WindowsPowerShell.git
     dest: '{{powershell_config_dir}}'
     branch: master
-- win_owner:
-    path: '{{powershell_config_dir}}'
-    user: Benie
-    recurse: true
 
 - name: install chocolatey package
   win_chocolatey:

roles/python/tasks/RedHat.yaml

@@ -1,7 +1,7 @@
 ---
-- name: install yum packages
+- name: install dnf packages
   become: true
-  yum:
+  dnf:
     name:
       - python3
       - python3-pip

roles/rpmfusion/tasks/main.yaml

@@ -0,0 +1,31 @@
+---
+- assert:
+    that: ansible_os_family == 'RedHat' and ansible_distribution == 'Fedora'
+
+- name: install rpm fusion free gpg key
+  become: true
+  rpm_key:
+    key: 'https://rpmfusion.org/keys?action=AttachFile&do=get&target=RPM-GPG-KEY-rpmfusion-free-fedora-2020'
+    state: present
+
+- name: install rpmfusion free repository
+  become: true
+  dnf:
+    name:
+      'https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-{{ansible_distribution_major_version}}.noarch.rpm'
+    state: present
+    validate_certs: no
+
+- name: install rpmfusion non-free gpg key
+  become: true
+  rpm_key:
+    key: 'https://rpmfusion.org/keys?action=AttachFile&do=get&target=RPM-GPG-KEY-rpmfusion-nonfree-fedora-2020'
+    state: present
+
+- name: install rpmfusion non-free repository
+  become: true
+  dnf:
+    name:
+      'https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-{{ansible_distribution_major_version}}.noarch.rpm'
+    state: present
+    validate_certs: no

roles/tmux/tasks/RedHat.yaml

@@ -1,7 +1,7 @@
 ---
-- name: install yum packages
+- name: install dnf packages
   become: true
-  yum:
+  dnf:
     name:
       - tmux
       - sysstat

roles/wsl/tasks/main.yaml

@@ -1,5 +1,6 @@
 ---
 - name: create wsl.conf
+  become: true
   template:
     src: templates/wsl.conf.j2
     dest: /etc/wsl.conf
@@ -34,28 +35,6 @@
     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
-
-- set_fact:
-    modules_dir: ~/.config/local/modules
-
-- name: create ansible modules directory
-  file:
-    dest: '{{modules_dir}}'
-    state: directory
-
-- name: copy win_git files to ansible modules directory
-  copy:
-    src: '~/.config/local/external/ansible-win_git/{{item}}'
-    dest: '{{modules_dir}}/{{item}}'
-  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")}}'

roles/xremap/tasks/main.yaml

@@ -1,7 +1,8 @@
 ---
 - assert:
-    that: ansible_env.XDG_CURRENT_DESKTOP == "GNOME" and
+    that: >
-          ansible_env.XDG_SESSION_TYPE == "wayland"
+      'GNOME' in ansible_env.XDG_CURRENT_DESKTOP and
+      ansible_env.XDG_SESSION_TYPE == 'wayland'
 
 - set_fact:
     install_dir: '{{ansible_env.HOME}}/.local/bin'
@@ -35,12 +36,14 @@
   set_fact:
     needs_installed:
       '{{not executable.stat.exists or installed_version != latest.json.name}}'
+    xdg_current_desktop:
+      "{{ansible_env.XDG_CURRENT_DESKTOP | regex_replace('(.*:)?(.*)', '\\2')}}"
 
 - name: construct asset query
   set_fact:
     asset_query: >
       [?contains(name, `xremap-linux-{{ansible_architecture}}-{{
-                     ansible_env.XDG_CURRENT_DESKTOP | lower}}.zip`)] | [0]
+                     xdg_current_desktop | lower}}.zip`)] | [0]
 - name: get release asset
   set_fact:
     asset: '{{latest.json.assets | to_json | from_json | json_query(asset_query)}}'
@@ -81,6 +84,14 @@
     append: true
     groups: input
 
+- name: load the uinput kernel module
+  when: ansible_os_family == 'Debian'
+  become: true
+  copy:
+    content: |
+      uinput
+    dest: /etc/modules-load.d/uinput.conf
+
 # TODO: This works for on Fedora, author uses it on Ubuntu so I assume Debian
 # will work too. Arch and other distros are potentially different see the docs
 # https://github.com/k0kubun/xremap

roles/zsh/tasks/RedHat.yaml

@@ -1,7 +1,7 @@
 ---
-- name: install yum packages
+- name: install dnf packages
   become: true
-  yum:
+  dnf:
     name:
       - zsh
       - pinentry-tty

roles/zsh/tasks/main.yaml

@@ -61,6 +61,11 @@
       dest: ~/.local/bin/cmake-uninstall
     - src: ~/.config/zsh/$
       dest: ~/.local/bin/$
+    - src: ~/.config/zsh/url/url
+      dest: ~/.local/bin/url
+    - src: ~/.config/zsh/url/_url
+      dest: ~/.local/share/zsh/site-functions/_url
+
   loop_control:
     label: '{{item.dest}}'