temp!

Fixes #25

library/gnome_custom_keybindings.py

@@ -0,0 +1,159 @@
+#!/usr/bin/python
+
+# Copyright: (c) 2018, Terry Jones <terry.jones@example.org>
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+from __future__ import (absolute_import, division, print_function)
+from typing import Dict, List
+__metaclass__ = type
+
+DOCUMENTATION = r'''
+---
+module: my_test
+
+short_description: This is my test module
+
+# If this is part of a collection, you need to use semantic versioning,
+# i.e. the version is of the form "2.5.0" and not "2.4".
+version_added: "1.0.0"
+
+description: This is my longer description explaining my test module.
+
+options:
+    name:
+        description: This is the message to send to the test module.
+        required: true
+        type: str
+    new:
+        description:
+            - Control to demo if the result of this module is changed or not.
+            - Parameter description can be a list as well.
+        required: false
+        type: bool
+# Specify this value according to your collection
+# in format of namespace.collection.doc_fragment_name
+# extends_documentation_fragment:
+#     - my_namespace.my_collection.my_doc_fragment_name
+
+author:
+    - Your Name (@yourGitHubHandle)
+'''
+
+EXAMPLES = r'''
+# Pass in a message
+- name: Test with a message
+  my_namespace.my_collection.my_test:
+    name: hello world
+
+# pass in a message and have changed true
+- name: Test with a message and changed output
+  my_namespace.my_collection.my_test:
+    name: hello world
+    new: true
+
+# fail the module
+- name: Test failure of the module
+  my_namespace.my_collection.my_test:
+    name: fail me
+'''
+
+RETURN = r'''
+# These are examples of possible return values, and in general should use other names for return values.
+original_message:
+    description: The original name param that was passed in.
+    type: str
+    returned: always
+    sample: 'hello world'
+message:
+    description: The output message that the test module generates.
+    type: str
+    returned: always
+    sample: 'goodbye'
+'''
+
+from ansible.module_utils.basic import AnsibleModule, subprocess
+
+
+def run_module():
+    # define available arguments/parameters a user can pass to the module
+    module_args = dict(
+        keybindings=dict(type='list', require=True),
+    )
+
+    # seed the result dict in the object
+    # we primarily care about changed and state
+    # changed is if this module effectively modified the target
+    # state will include any data that you want your module to pass back
+    # for consumption, for example, in a subsequent task
+    result = dict(
+        changed=False,
+        original_message='',
+        message=''
+    )
+
+    # the AnsibleModule object will be our abstraction working with Ansible
+    # this includes instantiation, a couple of common attr would be the
+    # args/params passed to the execution, as well as if the module
+    # supports check mode
+    module = AnsibleModule(
+        argument_spec=module_args,
+        supports_check_mode=True
+    )
+
+    # if the user is working with this module in only check mode we do not
+    # want to make any changes to the environment, just return the current
+    # state with no modifications
+    if module.check_mode:
+        module.exit_json(**result)
+
+    # manipulate or modify the state as needed (this is going to be the
+    # part where your module will do what it needs to do)
+
+    keybinding_entries = []
+    for index, keybinding in enumerate(module.params["keybindings"]):
+        keybinding_entries.append(
+            {
+                "key": f"org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom{index}",
+                "value": "\n".join(
+                    [
+                        f"binding='{keybinding['binding']}'",
+                        f"command='{keybinding['command']}'",
+                        f"name='{keybinding['name']}'",
+                    ]
+                ),
+            }
+        )
+
+    custom_keybindings = {
+        "key": "[org/gnome/settings-daemon/plugins/media-keys]",
+        "value": f"['{"', '".join([entry["key"] for entry in keybinding_entries])}']",
+    }
+
+    for conf in keybinding_entries + [custom_keybindings]:
+        subprocess.check_call(['dconf', 'write', conf.key, conf.value])
+
+    result['original_message'] = str(keybinding_entries)
+    result["message"] = str(custom_keybindings)
+
+    # use whatever logic you need to determine whether or not this module
+    # made any modifications to your target
+    # if module.params['new']:
+    result['changed'] = True
+
+    # during the execution of the module, if there is an exception or a
+    # conditional state that effectively causes a failure, run
+    # AnsibleModule.fail_json() to pass in the message and the result
+    # if module.params['name'] == 'fail me':
+    #     module.fail_json(msg='You requested this to fail', **result)
+
+    # in the event of a successful module execution, you will want to
+    # simple AnsibleModule.exit_json(), passing the key/value results
+    module.exit_json(**result)
+
+
+def main():
+    run_module()
+
+
+if __name__ == '__main__':
+    main()
+

library/win_git.ps1

@@ -7,8 +7,9 @@ $module = [Ansible.Basic.AnsibleModule]::Create($args, @{
     options = @{
         dest = @{type = 'path'}
         repo = @{required = $true; aliases = @('name')}
-        version = @{ default = 'HEAD' }
+        version = @{default = 'HEAD'; aliases = @('branch')}
         remote = @{default = 'origin'}
+        recursive = @{default = $true; type = 'bool'}
         executable = @{default = $null; type = 'path'}
     }
     supports_check_mode = $false
@@ -25,19 +26,6 @@ if ( !$git ) {
 
 # ================================= Utilities ==================================
 
-function Test-SshAcceptNewHostKey {
-    try {
-        $ssh = Get-ExecutablePath 'ssh'
-    } catch {
-        throw 'Remote host is missing ssh command, so you cannot use acceptnewhostkey option.'
-    }
-    $result = Run-Command "$ssh -o StrictHostKeyChecking=accept-new -V"
-    if ( $result.rc -ne 0 ) {
-        return $false
-    }
-    return $true
-}
-
 function Get-AbsolutePath {
     [CmdletBinding()]
     param (
@@ -82,46 +70,6 @@ function Get-GitDir {
     return $git_dir
 }
 
-function Get-GitSshExecutablePath {
-    if ( $env:GIT_SSH ) {
-        return $env:GIT_SSH
-    }
-    if ( $env:GIT_SSH_COMMAND ) {
-        return $env:GIT_SSH_COMMAND
-    }
-    return Get-ExecutablePath 'ssh'
-}
-
-function Test-GitRemoteBranch {
-    [CmdletBinding()]
-    param (
-        [Parameter(Mandatory = $true)] [String] $dest,
-        [Parameter(Mandatory = $true)] [String] $repository,
-        [Parameter(Mandatory = $true)] [String] $branch
-    )
-    $command = "`"$git`" ls-remote $repository -h refs/heads/$branch"
-    $result = Run-Command -command $command
-    if ( $result.stdout.Contains($version) ) {
-        return $true
-    }
-    return $false
-}
-
-function Test-GitRemoteTag {
-    [CmdletBinding()]
-    param (
-        [Parameter(Mandatory = $true)] [String] $dest,
-        [Parameter(Mandatory = $true)] [String] $repository,
-        [Parameter(Mandatory = $true)] [String] $tag
-    )
-    $command = "`"$git`" ls-remote $repository -t refs/tags/$tag"
-    $result = Run-Command -command $command
-    if ( $result.stdout.Contains($version) ) {
-        return $true
-    }
-    return $false
-}
-
 function Test-GitLocalChanges {
     [CmdletBinding()]
     param (
@@ -135,79 +83,19 @@ function Test-GitLocalChanges {
     return $changes.Lines -gt 0
 }
 
-function Get-GitRemoteHead {
-    [CmdletBinding()]
-    param (
-        [Parameter(Mandatory = $true)] [String] $repo,
-        [Parameter(Mandatory = $true)] [String] $dest,
-        [Parameter(Mandatory = $true)] [String] $version,
-        [Parameter(Mandatory = $true)] [String] $remote
-    )
-    $cloning = $false
-    $cwd = $null
-    $tag = $false
-    if ( $remote -eq $repo ) {
-        $cloning = $true
-    } else {
-        $cwd = $dest
-    }
-    if ( $version -eq 'HEAD' ) {
-        if ( $cloning ) {
-            # Cloning the repo, just get the remote's HEAD version.
-            $command = "`"$git`" ls-remote $remote -h HEAD"
-        } else {
-            $head_branch = Get-GitRemoteHeadBranch $module $dest $remote
-            $command = "`"$git`" ls-remote $remote -h refs/heads/$head_branch"
-        }
-    } elseif ( Test-GitRemoteBranch $dest $remote $version ) {
-        $command = "`"$git`" ls-remote $remote -h refs/head/$version"
-    } elseif ( Test-GitRemoteTag $dest $remote $version ) {
-        $tag = $true
-        $command = "`"$git`" ls-remote $remote -t refs/tags/$version*"
-    } else {
-        # Appears to be a sha1, return as-is since it apparently not possible
-        # to check for a specific sha1 on remote.
-        return $version
-    }
-    $result = Run-Command -command $command -working_directory $cwd
-    if ( $result.rc -ne 0 -or $result.stdout.Length -lt 1 ) {
-        throw "Could not determine remote ref for $vesion"
-    }
-    $ref = $result.stdout
-    if ( $tag ) {
-        # Find the dereferenced tag if this is an annotated tag.
-        ForEach ( $tag in $ref.Split([System.Environment]::NewLine) ) {
-            if ( $tag.EndsWith("$version ^{}") ) {
-                $ref = $tag
-            } elseif ( $tag.EndsWith($version) ) {
-                $ref = $tag
-            }
-        }
-    }
-    return $ref.Split()[0]
-}
-
-function Test-GitDetachedHead {
-    [CmdletBinding()]
-    Param (
-        [Parameter(Mandatory = $true)] [String] $dest
-    )
-}
-
 function Get-GitRemoteHeadBranch {
     [CmdletBinding()]
     Param (
         [Parameter(Mandatory = $true)] [String] $dest,
-        [Parameter(Mandatory = $true)] [String] $version,
         [Parameter(Mandatory = $true)] [String] $remote
     )
-    $git_dir = Join-Path $dest '.git'
-    # TODO: Check if the .git is a file. If it is a file, it means that we are
-    # in a submodule structure.
-    $head_file = Join-Path $git_dir 'HEAD'
-    if ( Test-GitDetachedHead $dest ) {
-        $head_file = Join-Path $git_dir 'refs' 'remotes' $remote 'HEAD'
+    $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 {
@@ -220,44 +108,6 @@ function Get-GitCurrentSha {
     return $result.stdout.Trim()
 }
 
-function Get-GitRemoteUrl {
-    [CmdletBinding()]
-    Param (
-        [Parameter(Mandatory = $true)] [String] $dest,
-        [Parameter(Mandatory = $true)] [String] $remote
-    )
-    $command = "`"$git`" ls-remote --get-url $remote"
-    $result = Run-Command -command $command -working_directory $dest
-    if ( $result.rc -ne 0 ) {
-        # There was an issue getting the remote URL, most likely command is not
-        # available in this version of Git.
-        return $null
-    }
-    return $result.stdout.Trim()
-}
-
-function Set-GitRemoteUrl {
-    [CmdletBinding()]
-    Param (
-        [Parameter(Mandatory = $true)] [String] $dest,
-        [Parameter(Mandatory = $true)] [String] $remote,
-        [Parameter(Mandatory = $true)] [String] $url
-    )
-    # Return if remote URL isn't changing.
-    $remote_url = Get-GitRemoteUrl $dest $remote
-    if ( $remote_url -eq $repo ) {
-        return $false
-    }
-    $command = "`"$git`" remote set-url $remote $url"
-    $result = Run-Command -command $command -working_directory $dest
-    if ( $result.rc -ne 0 ) {
-        $module.FailJson("Failed to set a new url $url for $remote`: $result.stderr")
-    }
-    # Return false if remote_url is null to maintain previous behavior for Git
-    # versions prior to 1.7.5 that lack required functionality.
-    return $remote_url -ne $null
-}
-
 function Invoke-GitClone {
     [CmdletBinding()]
     Param (
@@ -277,42 +127,63 @@ function Invoke-GitClone {
     if ($result.rc -ne 0) {
         $module.FailJson($result.stderr)
     }
-    # Ensure the newly cloned repository has the correct owner
-    $userName = [System.Security.Principal.WindowsIdentity]::GetCurrent().Name
-    $idRef = [System.Security.Principal.NTAccount]::new($userName)
-    Get-Item $dest | foreach { `
-        $_ ; $_ | Get-ChildItem -Force -Recurse `
-    } | foreach { `
-        $acl = $_ | Get-Acl; $acl.SetOwner($idRef); $_ | Set-Acl -AclObject $acl `
-    }
-}
-
-function Invoke-GitFetch {
-    [CmdletBinding()]
-    Param (
-        [Parameter(Mandatory = $true)] [String] $repo,
-        [Parameter(Mandatory = $true)] [String] $dest,
-        [Parameter(Mandatory = $true)] [String] $version,
-        [Parameter(Mandatory = $true)] [String] $remote
-    )
-    $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:" + `
-                         "$result.stdout $result.stderr")
-    }
 }
 
 function Invoke-GitCheckout {
     [CmdletBinding()]
     Param (
         [Parameter(Mandatory = $true)] [String] $dest,
+        [Parameter(Mandatory = $true)] [String] $remote,
         [Parameter(Mandatory = $true)] [String] $version
     )
-    $result = Run-Command -command "`"$git`" checkout $version" -working_directory $dest
+    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': " + `
-                         "$result.stdout $result.stderr")
+        $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)
     }
 }
 
@@ -327,18 +198,35 @@ $gitconfig = Join-Path $git_dir 'config'
 
 $module.Result.before = $null
 
-$local_changes = $false
-if ( ($dest -and ![System.IO.File]::Exists($gitconfig)) -or (!$dest -and !$clone) ) {
-    Invoke-GitClone $repo $remote $dest $version
+if (($dest -and ![System.IO.File]::Exists($gitconfig))) {
+    Invoke-GitClone $repo $remote $dest
+    Invoke-GitCheckout $dest $remote $version
     $module.Result.changed = $true
 } else {
-    $local_changes = Test-GitLocalChanges $dest
     $module.Result.before = Get-GitCurrentSha $dest
-    if ( $local_changes ) {
+    if (Test-GitLocalChanges $dest) {
         $module.FailJson('Local modifications exist in repository.')
     }
-    # Checkout branch, if $version is HEAD get HEAD branch
-    # Pull
+    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()

playbooks/Linux.yaml

@@ -2,7 +2,21 @@
 - import_playbook: LinuxCLI.yaml
 - import_playbook: UnixGUI.yaml
 - hosts: localhost
+  vars:
+    github_auth_headers: >-
+      {{ { 'Authorization': 'Bearer ' + lookup('env', 'GITHUB_TOKEN') }
+          if lookup('env', 'GITHUB_TOKEN') else {} }}
   roles:
+    - role: firefox
     - role: kitty
+    - role: guake
+    - role: cider
+    - role: gnome-shell
+      when: "'GNOME' in ansible_env.XDG_CURRENT_DESKTOP"
     - 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,6 +1,15 @@
 ---
+- hosts: localhost
+  vars:
+    github_auth_headers: >-
+      {{ { 'Authorization': 'Bearer ' + lookup('env', 'GITHUB_TOKEN') }
+          if lookup('env', 'GITHUB_TOKEN') else {} }}
+  roles:
+    - role: rpmfusion
+      when: ansible_os_family == 'RedHat' and ansible_distribution == 'Fedora'
 - import_playbook: UnixCLI.yaml
 - hosts: localhost
   roles:
     - role: gdb
+    - role: podman
     - role: system-info

playbooks/UnixCLI.yaml

@@ -1,19 +1,26 @@
 ---
 - hosts: localhost
+  vars:
+    github_auth_headers: >-
+      {{ { 'Authorization': 'Bearer ' + lookup('env', 'GITHUB_TOKEN') }
+          if lookup('env', 'GITHUB_TOKEN') else {} }}
   roles:
     - role: sudo
       when: ansible_user_id != "root"
     - role: python
 
     - role: zsh
+      tags: unsafe
     - role: neovim
     - role: tmux
+      tags: unsafe
 
     - role: ag
     - role: bash
     - role: bat
     - role: curl
     - role: editline
+    - role: fd
     - role: fzf
     - role: gh
     - role: git
@@ -22,6 +29,7 @@
     - role: jp
     - role: jq
     - role: readline
+    - role: ripgrep
     - role: tidy
     - role: tree
     - role: watch

playbooks/UnixGUI.yaml

@@ -1,7 +1,14 @@
 ---
 - hosts: localhost
+  vars:
+    github_auth_headers: >-
+      {{ { 'Authorization': 'Bearer ' + lookup('env', 'GITHUB_TOKEN') }
+          if lookup('env', 'GITHUB_TOKEN') else {} }}
   roles:
+    - role: flatpak
+      when: ansible_os_family != "Darwin"
+
     - role: 1password
+    - role: ferdium
     - role: fonts
     - role: obsidian
-    - role: webcatalog

playbooks/WSL.yaml

@@ -1,6 +1,9 @@
 ---
-- import_playbook: UnixCLI.yaml
+- import_playbook: LinuxCLI.yaml
 - hosts: localhost
+  vars:
+    github_auth_headers: >-
+      {{ { 'Authorization': 'Bearer ' + lookup('env', 'GITHUB_TOKEN') }
+          if lookup('env', 'GITHUB_TOKEN') else {} }}
   roles:
-    - role: gdb
     - role: wsl

playbooks/Windows.yaml

@@ -1,6 +1,9 @@
 ---
 - hosts: windows
-
+  vars:
+    github_auth_headers: >-
+      {{ { 'Authorization': 'Bearer ' + lookup('env', 'GITHUB_TOKEN') }
+          if lookup('env', 'GITHUB_TOKEN') else {} }}
   roles:
     - role: python
     - role: git
@@ -11,10 +14,12 @@
     - role: ag
     - role: bat
     - role: curl
+    - role: fd
     - role: fzf
     - role: gh
     - role: glab
     - role: jq
+    - role: ripgrep
     - role: tree
     - role: yq
 
@@ -23,7 +28,10 @@
 
     - role: 1password
     - role: autohotkey
+    - role: cider
+    - role: ferdium
     - role: firefox
+    - role: fonts
     - role: obsidian
     - role: powertoys
     - role: windows-terminal

playbooks/macOS.yaml

@@ -5,10 +5,18 @@
     - role: system-info
 - import_playbook: UnixGUI.yaml
 - hosts: localhost
+  vars:
+    github_auth_headers: >-
+      {{ { 'Authorization': 'Bearer ' + lookup('env', 'GITHUB_TOKEN') }
+          if lookup('env', 'GITHUB_TOKEN') else {} }}
   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/bat/tasks/deb.yaml

@@ -2,6 +2,7 @@
 - name: get latest github release
   uri:
     url: https://api.github.com/repos/sharkdp/bat/releases/latest
+    headers: '{{github_auth_headers}}'
   register: latest
 
 - set_fact:

roles/cider/tasks/main.yaml

@@ -0,0 +1,15 @@
+---
+- assert:
+    that: ansible_os_family != 'Darwin'
+
+- name: install chocolatey package
+  when: ansible_os_family == 'Windows'
+  win_chocolatey:
+    name: Cider
+    state: latest
+
+- name: install flatpak package
+  when: ansible_os_family != 'Windows'
+  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/fd/tasks/main.yaml

@@ -0,0 +1,26 @@
+---
+- name: install apt package
+  when: ansible_os_family == 'Debian'
+  become: true
+  apt:
+    name: fd-find
+    state: latest
+
+- name: install dnf package
+  when: ansible_os_family == 'RedHat'
+  become: true
+  dnf:
+    name: fd-find
+    state: latest
+
+- name: install Homebrew package
+  when: ansible_os_family == 'Darwin'
+  homebrew:
+    name: fd
+    state: latest
+
+- name: install Chocolatey package
+  when: ansible_os_family == 'Windows'
+  win_chocolatey:
+    name: fd
+    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/firefox/tasks/Ubuntu.yaml

@@ -0,0 +1,51 @@
+---
+- name: remove snap package
+  become: true
+  snap:
+    name: firefox
+    state: absent
+
+- name: create keyrings directory
+  become: true
+  file:
+    path: /etc/apt/keyrings
+    mode: '755'
+    state: directory
+
+- name: install mozilla repo keyring
+  become: true
+  get_url:
+    url: https://packages.mozilla.org/apt/repo-signing-key.gpg
+    dest: /etc/apt/keyrings/packages.mozilla.org.asc
+
+- name: add mozilla apt repo
+  become: true
+  copy:
+    content: >-
+      deb [signed-by=/etc/apt/keyrings/packages.mozilla.org.asc]
+      https://packages.mozilla.org/apt mozilla main
+    dest: /etc/apt/sources.list.d/mozilla.list
+
+- name: pin mozilla package
+  become: true
+  copy:
+    content: |
+      Package: *
+      Pin: origin packages.mozilla.org
+      Pin-Priority: 1000
+    dest: /etc/apt/preferences.d/mozilla
+
+- name: install mozilla package
+  become: true
+  apt:
+    name: firefox
+    state: latest
+    allow_downgrade: true
+    update_cache: true
+
+- name: install gnome shell integration
+  when: "'GNOME' in ansible_env.XDG_CURRENT_DESKTOP"
+  become: true
+  apt:
+    name: chrome-gnome-shell
+    state: latest

roles/firefox/tasks/main.yaml

@@ -1,2 +1,5 @@
 ---
-- include_tasks: '{{ansible_os_family}}.yaml'
+- include_tasks: Windows.yaml
+  when: ansible_os_family == 'Windows'
+- include_tasks: Ubuntu.yaml
+  when: ansible_distribution == 'Ubuntu'

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

@@ -17,6 +17,7 @@
 - name: get latest release
   uri:
     url: https://api.github.com/repos/ryanoasis/nerd-fonts/releases/latest
+    headers: '{{github_auth_headers}}'
   register: latest
 
 - set_fact:

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-installer.yaml

@@ -2,6 +2,7 @@
 - name: get json containing all releases
   win_uri:
     url: 'https://api.github.com/repos/git-for-windows/git/releases/tags/v{{git_version}}.windows.1'
+    headers: '{{github_auth_headers}}'
     return_content: true
   register: git_release
 

roles/git/tasks/Windows.yaml

@@ -31,17 +31,13 @@
 - include_tasks: Windows-installer.yaml
   when: git_run_installer
 
-# - name: clone config repos
-#   win_git:
-#     repo: '{{item.repo}}'
-#     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}}'
+# NOTE: If this is failing on first install of git, restart the sshd service.
+- name: clone config repos
+  win_git:
+    repo: '{{item.repo}}'
+    dest: '{{ansible_env.USERPROFILE}}/.config/{{item.name}}'
+    version: master
+  with_items: '{{git_config_repos}}'
 
 # - TODO: install pip packages
 #   win_pip:

roles/gitea/tasks/Linux.yaml

@@ -0,0 +1,49 @@
+---
+- name: stat tea executable
+  stat:
+    path: '{{tea_package_exe}}'
+  register: tea
+
+- name: get installed version
+  when: tea.stat.exists
+  command: '{{tea_package_exe}} --version'
+  register: tea_version_string
+
+- name: extract version number
+  when: tea.stat.exists
+  set_fact:
+    installed_version: "{{tea_version_string.stdout |
+      regex_search('^.*(\\d+\\.\\d+\\.\\d+).*golang.*$', '\\1') }}"
+
+- name: get latest release json
+  uri:
+    url: https://gitea.com/api/v1/repos/gitea/tea//releases/latest
+  register: latest
+
+- name: check installed version
+  set_fact:
+    install_required: >
+      {{not tea.stat.exists or latest.json.name != 'v' + installed_version[0]}}
+    asset: '{{latest.json.assets | json_query(tea_asset_query)}}'
+
+- name: create package directory
+  when: install_required
+  become: true
+  file:
+    state: directory
+    path: '{{tea_package_dir}}/bin'
+
+- name: download package
+  when: install_required
+  become: true
+  get_url:
+    url: '{{asset.browser_download_url}}'
+    dest: '{{tea_package_exe}}'
+    mode: '0755'
+
+- name: install package
+  when: install_required
+  become: true
+  command:
+    cmd: 'stow --target /usr/local .'
+    chdir: '{{tea_package_dir}}'

roles/gitea/tasks/main.yaml

@@ -0,0 +1,12 @@
+---
+- when: ansible_os_family != 'Darwin' and ansible_os_family != 'Windows'
+  include_tasks: Linux.yaml
+
+- when: ansible_os_family == 'Windows'
+  include_tasks: Windows.yaml
+
+- name: install homebrew package
+  when: ansible_os_family == 'Darwin'
+  homebrew:
+    name: tea
+    state: latest

roles/gitea/vars/main.yaml

@@ -0,0 +1,4 @@
+---
+tea_package_dir: /usr/local/stow/tea
+tea_package_exe: '{{tea_package_dir}}/bin/tea'
+tea_asset_query: '[?contains(name, `tea-`)] | [?contains(name, `linux-amd64`)] | [0]'

roles/gnome-shell/tasks/main.yaml

@@ -0,0 +1,38 @@
+---
+- assert:
+    that: "'GNOME' in ansible_env.XDG_CURRENT_DESKTOP"
+
+- name: install gnome-tweaks
+  become: true
+  package:
+    name: gnome-tweaks
+    state: latest
+
+# NOTE: Use this command to see default keybindings
+# gsettings list-recursively | grep -i -E 'media-keys|keybindings'
+# NOTE: Use this command to inspect the current state of the custom keybindings
+# dconf dump / | sed -n '/\[org.gnome.settings-daemon.plugins.media-keys/,/^$/p'
+
+- set_fact:
+    custom_keybindings:
+      # TODO: 1Password Quick Access
+      # [org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0]
+      # binding='<Shift><Alt>space'
+      # command='1password --quick-access'
+      # name='1Password Quick Access'
+      - binding: <Shift><Alt>space
+        command: 1password --quick-access
+        name: 1Password Quick Access
+
+      # TODO: Guake toggle - this requires removing a default binding
+      # [org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1]
+      # binding='<Super>space'
+      # command='guake-toggle'
+      # name='Guake Toggle'
+      - binding: <Super>space
+        command: guake-toggle
+        name: Guake Toggle
+
+# TODO: List of custom-keybindings
+# [org/gnome/settings-daemon/plugins/media-keys]
+# custom-keybindings=['/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/', '/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/']

roles/guake/tasks/main.yaml

@@ -0,0 +1,8 @@
+---
+- assert:
+    that: ansible_os_family != 'Darwin' and ansible_os_family != 'Windows'
+
+- name: install package
+  package:
+    name: guake
+    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/jp/tasks/Darwin.yaml

@@ -2,6 +2,7 @@
 - name: get latest github release
   uri:
     url: https://api.github.com/repos/jmespath/jp/releases/latest
+    headers: '{{github_auth_headers}}'
   register: latest
 
 - set_fact:

roles/jp/tasks/RedHat.yaml

@@ -19,6 +19,7 @@
 - name: get latest release
   uri:
     url: 'https://api.github.com/repos/jmespath/jp/releases/latest'
+    headers: '{{github_auth_headers}}'
   register: latest
 
 - name: determine if jp needs installed

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

@@ -2,6 +2,7 @@
 - name: get latest stable github release
   uri:
     url: https://api.github.com/repos/llvm/llvm-project/releases/latest
+    headers: '{{github_auth_headers}}'
   register: llvm_latest
 
 - name: read /etc/os-release

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,18 +1,114 @@
 ---
-- 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
+# Don't neovim packages because they are all behind, even Debian unstable.
+# Instead use the latest pre-build Linux package from GitHub, then stow them
+# into /usr/local.
 
-- name: install apt package
+- name: remove apt package
+  become: true
+  apt:
+    name: neovim
+    state: absent
+
+- name: install gnu stow for managing tar.gz package
   become: true
   apt:
     name:
-      - neovim
-      - python3-neovim
+      - stow
     state: latest
 
+- name: install python provider pip package
+  become: true
+  pip:
+    name: pynvim
+    state: latest
+
+- name: stat installed executable
+  stat:
+    path: /usr/local/bin/nvim
+  register: nvim
+
+- name: get installed version
+  when: nvim.stat.exists
+  command: nvim --version
+  register: nvim_version
+  changed_when: false
+
+- when: nvim.stat.exists
+  set_fact:
+    installed_version: '{{nvim_version.stdout_lines[0][5:]}}'
+
+- name: get latest version
+  uri:
+    url: https://api.github.com/repos/neovim/neovim/releases/latest
+    headers: '{{github_auth_headers}}'
+  register: latest
+
+- set_fact:
+    install_required:
+      '{{installed_version is not defined or
+         installed_version != latest.json.tag_name}}'
+    asset_query: '[?contains(name, `nvim-linux64.tar.gz`)]'
+    package_dir: '/usr/local/lib/nvim'
+- set_fact:
+    uninstall_required: '{{nvim.stat.exists and install_required}}'
+    asset: '{{latest.json.assets | json_query(asset_query)}}'
+    package_path: '{{package_dir}}/{{latest.json.name}}'
+
+- name: uninstall old package from /usr/local
+  when: uninstall_required
+  become: true
+  command:
+    cmd: 'stow --delete --target /usr/local .'
+    chdir: '{{package_dir}}/nvim-linux64'
+
+- name: remove old package
+  become: true
+  when: uninstall_required
+  file:
+    path: '{{package_dir}}/nvim-linux64'
+    state: absent
+
+- name: create package directory
+  become: true
+  file:
+    path: '{{package_dir}}'
+    state: directory
+
+- name: download package archive
+  when: install_required
+  become: true
+  get_url:
+    url: '{{asset[0].browser_download_url}}'
+    dest: '{{package_path}}'
+
+- name: extract package archive
+  when: install_required
+  become: true
+  unarchive:
+    src: '{{package_path}}'
+    dest: '{{package_dir}}'
+
+- name: remove downloaded archive
+  when: install_required
+  become: true
+  file:
+    path: '{{package_path}}'
+    state: absent
+
+- name: move man to share/man
+  when: install_required
+  become: true
+  command:
+    argv:
+      - mv
+      - '{{package_dir}}/nvim-linux64/man'
+      - '{{package_dir}}/nvim-linux64/share'
+
+- name: install package to /usr/local
+  when: install_required
+  become: true
+  command:
+    cmd: 'stow --target /usr/local .'
+    chdir: '{{package_dir}}/nvim-linux64'
+
 - include_tasks: Unix.yaml

roles/neovim/tasks/Unix.yaml

@@ -4,9 +4,9 @@
 
 - name: clone config repo
   git:
-    repo: git@code.infektor.net:config/vim.git
+    repo: git@code.infektor.net:config/nvim.git
     dest: '{{vim_config_dir}}'
-    version: master
+    version: main
 
 - name: install pip packages
   pip:

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

@@ -8,20 +8,12 @@
 - set_fact:
     vim_config_dir: '{{ansible_env.LOCALAPPDATA}}\nvim'
 
-# - name: clone config repo
-#   win_git:
-#     repo: git@code.infektor.net:config/vim.git
-#     dest: '{{vim_config_dir}}'
-#     branch: master
-#     # clone: false
-#     update: true
-# - win_owner:
-#     path: '{{vim_config_dir}}'
-#     user: Benie
-#     recurse: true
+- name: clone config repo
+  win_git:
+    repo: git@code.infektor.net:config/nvim.git
+    dest: '{{vim_config_dir}}'
+    branch: main
 
-# - TODO: neovim set repo email
-#   win_git_config:
 # - TODO: neovim install pip packages
 #   win_pip:
 #     name: '{{neovim_pip_packages}}'
@@ -47,10 +39,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]'
-- 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
+- name: remove appimage icon file
   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: create desktop file
-  template:
-    src: obsidian.desktop.j2
+- name: remove appimage desktop file
+  file:
     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/podman/tasks/main.yaml

@@ -0,0 +1,26 @@
+---
+- name: install apt package
+  when: ansible_os_family == 'Debian'
+  become: true
+  apt:
+    name: podman
+    state: latest
+
+- name: install dnf package
+  when: ansible_os_family == 'RedHat'
+  become: true
+  dnf:
+    name: podman
+    state: latest
+
+- name: install Homebrew package
+  when: ansible_os_family == 'Darwin'
+  homebrew:
+    name: podman-desktop
+    state: latest
+
+- name: install Chocolatey package
+  when: ansible_os_family == 'Windows'
+  win_chocolatey:
+    name: podman-desktop
+    state: latest

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/python/tasks/Unix.yaml

@@ -4,8 +4,6 @@
     repo: git@code.infektor.net:config/python.git
     dest: ~/.config/python
 
-# TODO: set repo email
-
 - name: create config directories
   file:
     state: directory

roles/python/tasks/Windows.yaml

@@ -6,7 +6,6 @@
     state: latest
 
 # TODO: - name: install config repo
-# TODO: - name: set repo email
 # TODO: - name: install pip packages
 # TODO: - name: create config directories/files
 

roles/ripgrep/tasks/main.yaml

@@ -0,0 +1,26 @@
+---
+- name: install apt package
+  when: ansible_os_family == 'Debian'
+  become: true
+  apt:
+    name: ripgrep
+    state: latest
+
+- name: install dnf package
+  when: ansible_os_family == 'RedHat'
+  become: true
+  dnf:
+    name: ripgrep
+    state: latest
+
+- name: install Homebrew package
+  when: ansible_os_family == 'Darwin'
+  homebrew:
+    name: ripgrep
+    state: latest
+
+- name: install Chocolatey package
+  when: ansible_os_family == 'Windows'
+  win_chocolatey:
+    name: ripgrep
+    state: latest

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

@@ -1,4 +1,4 @@
 ---
-# TODO:
+# TODO: create a launchd module that handles user mode services
 # cp $script_dir/system-info.plist ~/Library/LaunchAgents/system-info.plist
 # launchctl load -w ~/Library/LaunchAgents/system-info.plist

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

@@ -7,6 +7,4 @@
     dest: ~/.config/tmux
     version: master
 
-# TODO: - name: set repo email
-
 - include_tasks: ~/.config/tmux/tasks.yaml

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
-          ansible_env.XDG_SESSION_TYPE == "wayland"
+    that: >
+      'GNOME' in ansible_env.XDG_CURRENT_DESKTOP and
+      ansible_env.XDG_SESSION_TYPE == 'wayland'
 
 - set_fact:
     install_dir: '{{ansible_env.HOME}}/.local/bin'
@@ -29,18 +30,21 @@
 - name: get latest release
   uri:
     url: https://api.github.com/repos/k0kubun/xremap/releases/latest
+    headers: '{{github_auth_headers}}'
   register: latest
 
 - name: determine if install needed
   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 +85,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/yq/tasks/Debian.yaml

@@ -2,6 +2,7 @@
 - name: get latest github release
   uri:
     url: https://api.github.com/repos/mikefarah/yq/releases/latest
+    headers: '{{github_auth_headers}}'
   register: latest
 
 - set_fact:

roles/yq/tasks/RedHat.yaml

@@ -19,6 +19,7 @@
 - name: get latest release
   uri:
     url: 'https://api.github.com/repos/mikefarah/yq/releases/latest'
+    headers: '{{github_auth_headers}}'
   register: latest
 
 - name: determine if yq needs installed

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}}'