temp!

.gitignore

@@ -1,3 +1,2 @@
 external
 playbooks/test.yaml
-__pycache__

ansible.cfg

@@ -2,4 +2,4 @@
 collections_path = collections
 library = library
 roles_path = roles
-result_format = yaml
+stdout_callback = yaml

library/gsettings.py

@@ -1,146 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from typing import Tuple
-from ansible.module_utils.basic import AnsibleModule
-
-DOCUMENTATION = """
-module: gsettings
-author:
-    - Kenneth Benzie (Benie)
-short_description: Ansible module for the gsettings configuration tool
-options:
-    schema:
-        description:
-            - Schema ID of the settings to configure.
-        type: str
-    key:
-        description:
-            - Key of an individaul setting to configure.
-        type: str
-    value:
-        description:
-            - Value to configure the setting with.
-            - Mutually exclusive with reset.
-        type: str
-    reset:
-        description:
-            - Flag to reset the setting to the default value.
-            - Mutually exclusive with value.
-        type:
-        default: false
-"""
-
-EXAMPLES = """
-- name: get gnome color-scheme current value
-  gsettings:
-    schema: org.gnome.desktop.interface
-    key: color-scheme
-  register: color_scheme
-- debug: msg={{color_scheme.value}}
-
-- name: set gnome color-scheme to 'prefer-dark'
-  gsettings:
-    schema: org.gnome.desktop.interface
-    key: color-scheme
-    value: "'prefer-dark'"
-
-- name: reset gnome color-scheme to default value
-  gsettings:
-    schema: org.gnome.desktop.interface
-    key: color-scheme
-    reset: true
-"""
-
-RETURN = """
-value:
-    description: Value of the setting.
-    returned: Returned when there is a value.
-    type: str
-    sample: "'default'"
-stderr:
-    description: Error output from gsettings.
-    returned: Returned when there is an error.
-    type: str
-    sample: No such key “doesnt-exist”
-"""
-
-
-class GSettingsError(Exception):
-    def __init__(self, command, rc, stderr):
-        self.command = command
-        self.rc = (rc,)
-        self.stderr = stderr
-
-
-def gsettings_get(module: AnsibleModule) -> Tuple[bool, str]:
-    command = [
-        "gsettings",
-        "get",
-        module.params["schema"],
-        module.params["key"],
-    ]
-    rc, stdout, stderr = module.run_command(command)
-    if rc != 0:
-        raise GSettingsError(command, rc, stderr)
-    return False, stdout.rstrip()
-
-
-def gsettings_set(module: AnsibleModule) -> Tuple[bool, str]:
-    command = [
-        "gsettings",
-        "set",
-        module.params["schema"],
-        module.params["key"],
-        module.params["value"],
-    ]
-    _, before = gsettings_get(module)
-    rc, _, stderr = module.run_command(command)
-    if rc != 0:
-        raise GSettingsError(command, rc, stderr)
-    _, after = gsettings_get(module)
-    return before != after, after
-
-
-def gsettings_reset(module: AnsibleModule) -> Tuple[bool, str]:
-    command = [
-        "gsettings",
-        "reset",
-        module.params["schema"],
-        module.params["key"],
-    ]
-    _, before = gsettings_get(module)
-    rc, stdout, stderr = module.run_command(command)
-    if rc != 0:
-        raise GSettingsError(command, rc, stderr)
-    _, after = gsettings_get(module)
-    return before != after, after
-
-
-def main() -> None:
-    module = AnsibleModule(
-        argument_spec=dict(
-            schema=dict(type="str"),
-            key=dict(type="str"),
-            value=dict(type="str"),
-            reset=dict(type="bool", default=False),
-        ),
-        mutually_exclusive=[["value", "reset"]],
-        required_together=[["schema", "key"]],
-    )
-
-    try:
-        if module.params["value"]:
-            changed, value = gsettings_set(module)
-        elif module.params["reset"]:
-            changed, value = gsettings_reset(module)
-        else:
-            changed, value = gsettings_get(module)
-        module.exit_json(changed=changed, value=value)
-    except GSettingsError as error:
-        module.fail_json(
-            f"{error.command} failed ({error.rc}): {error.stderr}", stderr=error.stderr
-        )
-
-
-if __name__ == "__main__":
-    main()

library/win_git.ps1

@@ -5,12 +5,11 @@
 
 $module = [Ansible.Basic.AnsibleModule]::Create($args, @{
     options = @{
-        dest = @{type = 'path'}
+        dest = @{ type = 'path' }
-        repo = @{required = $true; aliases = @('name')}
+        repo = @{ required = $true; aliases = @( 'name' ) }
-        version = @{default = 'HEAD'; aliases = @('branch')}
+        version = @{ default = 'HEAD' }
-        remote = @{default = 'origin'}
+        remote = @{ default = 'origin' }
-        recursive = @{default = $true; type = 'bool'}
+        executable = @{ default = $null; type = 'path' }
-        executable = @{default = $null; type = 'path'}
     }
     supports_check_mode = $false
 })
@@ -20,12 +19,25 @@ $repo = $module.Params.repo
 $version = $module.Params.version
 $remote = $module.Params.remote
 $git = $module.Params.executable
-if (!$git) {
+if ( !$git ) {
     $git = Get-ExecutablePath '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 (
@@ -46,30 +58,70 @@ function Get-GitDir {
     )
     $git_dir = Join-Path $path '.git'
     # Check if this .git is a file.
-    if ([System.IO.File]::Exists($git_dir)) {
+    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:') {
+        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)) {
+        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)) {
+        if ( ![System.IO.Directory]::Exists($git_dir) ) {
             throw "$git_dir is not a directory."
         }
     }
     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 (
@@ -83,19 +135,79 @@ 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
     )
-    $command = "`"$git`" symbolic-ref --short refs/remotes/$remote/HEAD"
+    $git_dir = Join-Path $dest '.git'
-    $result = Run-Command -command $command -working_directory $dest
+    # TODO: Check if the .git is a file. If it is a file, it means that we are
-    if ($result.rc -ne 0) {
+    # in a submodule structure.
-        $module.FailJson("Could not determine the default HEAD branch of remote: $remote" ` +
+    $head_file = Join-Path $git_dir 'HEAD'
-                         $result.stderr)
+    if ( Test-GitDetachedHead $dest ) {
+        $head_file = Join-Path $git_dir 'refs' 'remotes' $remote 'HEAD'
     }
-    return $result.stdout.Trim().Replace("$remote/", '')
 }
 
 function Get-GitCurrentSha {
@@ -114,10 +226,38 @@ function Get-GitRemoteUrl {
         [Parameter(Mandatory = $true)] [String] $dest,
         [Parameter(Mandatory = $true)] [String] $remote
     )
-    $result = Run-Command -command "`"$git`" remote get-url $remote" -working_directory $dest
+    $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 (
@@ -126,93 +266,59 @@ function Invoke-GitClone {
         [Parameter(Mandatory = $true)] [String] $dest
     )
     $dest_parent = Split-Path -Path $dest -Parent
-    if (!(Test-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") {
+    if ( $version -ne "HEAD" ) {
         $command += " --branch $version"
     }
     $result = Run-Command -command $command -working_directory $cwd
-    if ($result.rc -ne 0) {
+    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
     )
-    if ($version -eq "HEAD") {
+    $result = Run-Command -command "`"$git`" checkout $version" -working_directory $dest
-        $branch = Get-GitRemoteHeadBranch $dest $remote
+    if ( $result.rc -ne 0 ) {
-    } else {
+        $module.FailJson("Failed to checkout version '$version': " + `
-        $branch = $version
+                         "$result.stdout $result.stderr")
-    }
-    $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)
-    }
-}
-
-function Invoke-GitRemoteSetUrl {
-    [CmdletBinding()]
-    Param (
-        [Parameter(Mandatory = $true)] [String] $dest,
-        [Parameter(Mandatory = $true)] [String] $remote,
-        [Parameter(Mandatory = $true)] [String] $url
-    )
-    $result = Run-Command -command "`"$git`" remote set-url $remote `"$url`"" -working_directory $dest
-    if ($result.rc -ne 0) {
-        $module.FailJson("Failed to set remote URL:`n" + $result.stderr)
     }
 }
 
 # ================================ Start logic =================================
 
-if (!$dest) {
+if ( !$dest ) {
     $module.FailJson('The destination directory must be specified.')
 }
 $dest = Get-AbsolutePath $dest
@@ -221,39 +327,18 @@ $gitconfig = Join-Path $git_dir 'config'
 
 $module.Result.before = $null
 
-if (($dest -and ![System.IO.File]::Exists($gitconfig))) {
+$local_changes = $false
-    Invoke-GitClone $repo $remote $dest
+if ( ($dest -and ![System.IO.File]::Exists($gitconfig)) -or (!$dest -and !$clone) ) {
-    Invoke-GitCheckout $dest $remote $version
+    Invoke-GitClone $repo $remote $dest $version
     $module.Result.changed = $true
 } else {
+    $local_changes = Test-GitLocalChanges $dest
     $module.Result.before = Get-GitCurrentSha $dest
-    if (Test-GitLocalChanges $dest) {
+    if ( $local_changes ) {
         $module.FailJson('Local modifications exist in repository.')
     }
-    $url = Get-GitRemoteUrl $dest $remote
+    # Checkout branch, if $version is HEAD get HEAD branch
-    if ($url -ne $repo) {
+    # Pull
-        Invoke-GitRemoteSetUrl $dest $remote $repo
-    }
-    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

@@ -22,6 +22,27 @@ 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

library/win_winget.ps1

@@ -1,99 +0,0 @@
-#!powershell
-
-#AnsibleRequires -CSharpUtil Ansible.Basic
-#AnsibleRequires -PowerShell Ansible.ModuleUtils.CommandUtil
-
-$module = [Ansible.Basic.AnsibleModule]::Create($args, @{
-    options = @{
-        name = @{
-            type = "list"
-            elements = "str"
-            required = $true
-        }
-        state = @{
-            type = "str"
-            default = "present"
-            choices = ("absent", "latest", "present")
-        }
-    }
-    supports_check_mode = $false
-})
-
-$names = $module.Params.name
-$state = $module.Params.state
-$winget = Get-ExecutablePath "winget"
-$noPackageString = "No installed package found matching input criteria."
-
-if ($name -and $id) {
-    $module.FailJson("name `"$name`" and id `"$id`" must not both be provided")
-}
-
-function Test-Installed {
-    $command = "`"$winget`" list `"$name`""
-    $result = Run-Command -command $command
-    if ($result.rc -eq 0) {
-        return $true
-    }
-    return $false
-}
-
-function Test-UpgradeAvailable {
-    if (!(Test-Installed)) {
-        return $true
-    }
-    $command = "`"$winget`" list --upgrade-available `"$name`""
-    $result = Run-Command -command $command
-    if ($result.stdout.Contains($noPackageString)) {
-        return $false
-    }
-    return $true
-}
-
-foreach ($name in $names) {
-    switch ($state) {
-        "absent" {
-            if (Test-Installed) {
-                $command = "`"$winget`" uninstall `"$name`""
-                $result = Run-Command -command $command
-                if ($result.rc -ne 0) {
-                    $module.Result.rc = $result.rc
-                    $module.Result.stdout = $result.stdout
-                    $module.FailJson("Failed to uninstall package `"$name`"")
-                }
-                $module.Result.stdout = $result.stdout
-                $module.Result.changed = $true
-            }
-        }
-
-        "latest" {
-            if (Test-UpgradeAvailable) {
-                $command = "`"$winget`" install --accept-package-agreements --accept-source-agreements `"$name`""
-                $result = Run-Command -command $command
-                if ($result.rc -ne 0) {
-                    $module.Result.rc = $result.rc
-                    $module.Result.stdout = $result.stdout
-                    $module.FailJson("Failed to install package `"$name`"")
-                }
-                $module.Result.stdout = $result.stdout
-                $module.Result.changed = $true
-            }
-        }
-
-        "present" {
-            if (!(Test-Installed)) {
-                $command = "`"$winget`" install --accept-package-agreements --accept-source-agreements `"$name`""
-                $result = Run-Command -command $command
-                if ($result.rc -ne 0) {
-                    $module.Result.rc = $result.rc
-                    $module.Result.stdout = $result.stdout
-                    $module.FailJson("Failed to install package `"$name`"")
-                }
-                $module.Result.stdout = $result.stdout
-                $module.Result.changed = $true
-            }
-        }
-    }
-}
-
-$module.Result.rc = 0
-$module.ExitJson()

library/win_winget.py

@@ -1,47 +0,0 @@
-# -*- coding: utf-8 -*-
-
-DOCUMENTATION = '''
-module: win_winget
-author:
-  - "Kenneth Benzie (Benie)"
-short_desription: Manages packages with WinGet
-description:
-  - Magage packages using WinGet.
-options:
-  name:
-    description:
-      - Name of the package to manage.
-    type: list[str]
-  state:
-    description:
-      - Indicates the desired package state. V(latest) ensures that the latest
-        version is installed.
-    type: str
-    choices: [ absent, present, latest ]
-    default: present
-'''
-
-EXAMPLES = '''
-- name: Install Apple Music
-  win_winget:
-    name: Apple Music
-    state: present
-
-- name: Install latest version of Neovim Qt
-  win_winget:
-    name: neovim-qt
-    state: latest
-
-- name: Uninstall Microsoft OneDrive
-  win_winget:
-    id: Microsoft.OneDrive
-    state: absent
-'''
-
-RETURN = '''
-stdout:
-  description: Output from WinGet.
-  returned: Success, when needed.
-  type: str
-  sample: ''
-'''

playbooks/1password.yaml

@@ -1,6 +1,4 @@
 ---
 - hosts: localhost
-  vars_files:
-    - vars/environment.yaml
   roles:
     - 1password

playbooks/Linux.yaml

@@ -2,16 +2,7 @@
 - import_playbook: LinuxCLI.yaml
 - import_playbook: UnixGUI.yaml
 - hosts: localhost
-  vars_files:
-    - vars/environment.yaml
   roles:
-    - role: firefox
     - role: kitty
-    - role: cider
-    - role: ulauncher
-    - role: gnome-shell
-      when: "'GNOME' in ansible_env.XDG_CURRENT_DESKTOP"
     - role: xremap
-      when: "'GNOME' in ansible_env.XDG_CURRENT_DESKTOP"
+      when: ansible_os_family == "RedHat"
-    - role: fedora-workstation
-      when: ansible_os_family == 'RedHat' and ansible_distribution == 'Fedora'

playbooks/LinuxCLI.yaml

@@ -1,17 +1,6 @@
 ---
-- hosts: localhost
-  vars_files:
-    - vars/environment.yaml
-  roles:
-    - role: rpmfusion
-      when: ansible_os_family == 'RedHat' and ansible_distribution == 'Fedora'
 - import_playbook: UnixCLI.yaml
 - hosts: localhost
-  vars_files:
-    - vars/environment.yaml
   roles:
     - role: gdb
-    - role: nvtop
-    - role: podman
     - role: system-info
-      when: disable_systemd is not defined

playbooks/UnixCLI.yaml

@@ -1,24 +1,19 @@
 ---
 - hosts: localhost
-  vars_files:
-    - vars/environment.yaml
   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
@@ -27,10 +22,8 @@
     - role: jp
     - role: jq
     - role: readline
-    - role: ripgrep
     - role: tidy
     - role: tree
-    - role: typst
     - role: watch
     - role: wget
     - role: yq

playbooks/UnixGUI.yaml

@@ -1,12 +1,7 @@
 ---
 - hosts: localhost
-  vars_files:
-    - vars/environment.yaml
   roles:
-    - role: flatpak
-      when: ansible_os_family != "Darwin"
-
     - role: 1password
-    - role: ferdium
     - role: fonts
     - role: obsidian
+    - role: webcatalog

playbooks/WSL.yaml

@@ -1,7 +1,6 @@
 ---
-- import_playbook: LinuxCLI.yaml
+- import_playbook: UnixCLI.yaml
 - hosts: localhost
-  vars_files:
-    - vars/environment.yaml
   roles:
+    - role: gdb
     - role: wsl

playbooks/Windows.yaml

@@ -1,17 +1,29 @@
 ---
-- import_playbook: WindowsCLI.yaml
 - hosts: windows
-  vars_files:
+
-    - vars/environment.yaml
   roles:
+    - role: python
+    - role: git
+    - role: powershell
+    - role: neovim
+    - role: system-info
+
+    - role: ag
+    - role: bat
+    - role: curl
+    - role: fzf
+    - role: gh
+    - role: glab
+    - role: jq
+    - role: tree
+    - role: yq
+
+    - role: llvm
+    - role: nodejs
+
     - role: 1password
     - role: autohotkey
-    - role: apple-music
-    - role: ferdium
     - role: firefox
-    - role: fonts
     - role: obsidian
     - role: powertoys
     - role: windows-terminal
-    - role: wezterm
-    - role: neovide

playbooks/WindowsCLI.yaml

@@ -1,27 +0,0 @@
----
-- hosts: windows
-  vars_files:
-    - vars/environment.yaml
-  roles:
-    - role: scoop
-    - role: python
-    - role: git
-    - role: powershell
-    - role: neovim
-    - role: system-info
-
-    - role: ag
-    - role: bat
-    - role: curl
-    - role: fd
-    - role: fzf
-    - role: gh
-    - role: glab
-    - role: jq
-    - role: ripgrep
-    - role: tree
-    - role: typst
-    - role: yq
-
-    - role: llvm
-    - role: nodejs

playbooks/macOS-work.yaml

@@ -1,12 +0,0 @@
----
-- import_playbook: UnixCLI.yaml
-- hosts: localhost
-  vars_files:
-    - vars/environment.yaml
-  roles:
-    - role: system-info
-    - role: fonts
-    - role: iterm
-    - role: kitty
-    - role: neovide
-    - role: macos

playbooks/macOS.yaml

@@ -1,23 +1,14 @@
 ---
 - import_playbook: UnixCLI.yaml
 - hosts: localhost
-  vars_files:
-    - vars/environment.yaml
   roles:
     - role: system-info
 - import_playbook: UnixGUI.yaml
 - hosts: localhost
-  vars_files:
-    - vars/environment.yaml
   roles:
     - role: mas
 
-    - role: hiddenbar
     - role: iterm
-    - role: kitty
-    - role: neovide
     - role: magnet
-    - role: windows-app
+    - role: microsoft-remote-desktop
     - role: viscosity
-
-    - role: macos

playbooks/vars/environment.yaml

@@ -1,15 +0,0 @@
----
-# GitHub may rate limit unauthenticated API requests, this is more likely when
-# behind a network proxy. Set the GITHUB_TOKEN environment variable to
-# authenticate any GitHub API requests executed while playing roles.
-github_auth_headers: >-
-  {{ { 'Authorization': 'Bearer ' + lookup('env', 'GITHUB_TOKEN') }
-      if lookup('env', 'GITHUB_TOKEN') else {} }}
-
-# When working behind a network proxy, set the http_proxy and https_proxy
-# environment variables. These will be passed through to uses of the `get_url`
-# module when playing roles.
-proxy_environment: >-
-  {{ { 'http_proxy': lookup('env', 'http_proxy'),
-       'https_proxy': lookup('env', 'https_proxy') }
-      if lookup('env', 'http_proxy') and lookup('env', 'https_proxy') else {} }}

roles/1password/tasks/Debian.yaml

@@ -16,7 +16,6 @@
   get_url:
     url: https://downloads.1password.com/linux/keys/1password.asc
     dest: '{{keyring}}'
-  environment: '{{proxy_environment}}'
 
 - name: set compatible architecture
   when: ansible_machine == 'x86_64'
@@ -36,11 +35,6 @@
       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
@@ -62,5 +56,4 @@
     src: /mnt/c/Users/Benie/AppData/Local/1Password/cli/op.exe
     dest: ~/.local/bin/op
 
-- include_tasks: linux-autostart.yaml
 - include_tasks: zsh-completion.yaml

roles/1password/tasks/RedHat.yaml

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

roles/1password/tasks/Windows.yaml

@@ -6,10 +6,40 @@
     app_exe: '{{ansible_env.LOCALAPPDATA}}/1Password/app/8/1Password.exe'
     installer_exe: '{{ansible_env.TEMP}}/1PasswordSetup-latest.exe'
 
-- name: install chocolatey package
+- name: check if already installed
-  win_chocolatey:
+  win_stat:
-    state: latest
+    path: '{{app_exe}}'
-    name: 1password
+  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
+  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
+  win_command: '{{installer_exe}}'
 
 - name: create start menu shortcut
   win_shortcut:
@@ -18,27 +48,50 @@
     icon: '{{app_exe}},0'
 
 # CLI
-- name: install scoop cli package
-  community.windows.win_scoop:
-    state: present
-    name: 1password-cli
-
 - set_fact:
     cli_dir: '{{ansible_env.LOCALAPPDATA}}\1Password\cli'
+    cli_zip: '{{ansible_env.TEMP}}/op_windows_amd64.zip'
+- set_fact:
+    cli_exe: '{{cli_dir}}\op.exe'
 
-- name: create cli directory
+- name: check if op already installed
-  win_file:
+  win_stat:
-    state: directory
+    path: '{{cli_exe}}'
-    path: '{{cli_dir}}'
+  register: cli_stat
 
-- name: remove old op executable
+- name: get installed op version
-  win_file:
+  when: cli_stat.stat.exists == True
-    state: absent
+  win_command: '{{cli_exe}} --version'
-    path: '{{cli_dir}}\op.exe'
+  register: cli_version
+  changed_when: false
 
-- name: remove old op install directory from user PATH
+- when: cli_stat.stat.exists == True
+  set_fact:
+    cli_installed_version: '{{cli_version.stdout.strip()}}'
+
+- name: get list of op releases
+  win_uri:
+    url: https://raw.githubusercontent.com/kbenzie/op-release-scraper/main/op-releases.json
+    return_content: true
+  register: releases
+
+- set_fact:
+    latest: '{{releases.json[0]}}'
+
+- name: download latest op zip archive
+  when: cli_installed_version is not defined or cli_installed_version != latest.version
+  win_get_url:
+    url: '{{latest.downloads.Windows.amd64}}'
+    dest: '{{cli_zip}}'
+
+- name: unzip op zip archive
+  when: cli_installed_version is not defined or cli_installed_version != latest.version
+  win_unzip:
+    src: '{{cli_zip}}'
+    dest: '{{cli_dir}}'
+
+- name: add op install directory to user PATH
   win_path:
-    state: absent
     scope: user
     name: Path
     elements: '{{cli_dir}}'
@@ -46,7 +99,7 @@
 - name: get op powershell completion script
   win_command:
     argv:
-      - '{{ansible_env.LOCALAPPDATA}}\Scoop\shims\op.exe'
+      - '{{ansible_env.LOCALAPPDATA}}/1Password/cli/op.exe'
       - completion
       - powershell
   register: powershell_completion_script

roles/1password/tasks/linux-autostart.yaml

@@ -1,20 +0,0 @@
----
-- name: create ~/.config/autostart directory
-  file:
-    state: directory
-    path: ~/.config/autostart
-
-- name: create autostart desktop file
-  copy:
-    dest: '{{ansible_env.HOME}}/.config/autostart/1password.desktop'
-    content: |
-      [Desktop Entry]
-      Name=1Password
-      Exec=/opt/1Password/1password %U
-      Terminal=false
-      Type=Application
-      Icon=1password
-      StartupWMClass=1Password
-      Comment=Password manager and secure wallet
-      MimeType=x-scheme-handler/onepassword;x-scheme-handler/onepassword8;
-      Categories=Office;

roles/ag/tasks/RedHat.yaml

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

roles/ag/tasks/Windows.yaml

@@ -1,10 +1,5 @@
 ---
-- name: remove chocolatey package
+- name: install chocolatey package
   win_chocolatey:
     name: ag
-    state: absent
+    state: latest
-
-- name: install scoop package
-  community.windows.win_scoop:
-    name: ag
-    state: present

roles/apple-music/tasks/main.yaml

@@ -1,10 +0,0 @@
----
-- name: install Apple Music from Microsoft Store
-  win_winget:
-    name: Apple Music
-    state: latest
-
-- name: remove Cider from Chocolatey
-  win_chocolatey:
-    name: Cider
-    state: absent

roles/autohotkey/tasks/main.yaml

@@ -6,9 +6,13 @@
 
 - name: clone config repo
   win_git:
-    repo: git@git.infektor.net:config/AutoHotKey.git
+    repo: git@code.infektor.net:config/AutoHotKey.git
     dest: '{{autohotkey_repo_dir}}'
-    branch: main
+    branch: master
+- win_owner:
+    path: '{{autohotkey_repo_dir}}'
+    user: Benie
+    recurse: true
 
 - name: create scheduled task
   win_scheduled_task:
@@ -31,25 +35,3 @@
     run_level: highest
     start_when_available: true
     wake_to_run: false
-
-- name: create scheduled task
-  win_scheduled_task:
-    path: Benie
-    name: mouse.ahk
-    state: present
-    enable: true
-    triggers:
-      - type: logon
-        enabled: true
-      - type: registration
-        enabled: true
-    actions:
-      - path: '{{autohotkey_repo_dir}}/mouse.ahk'
-    disallow_start_if_on_batteries: false
-    stop_if_going_on_batteries: false
-    execution_time_limit: PT0S
-    logon_type: interactive_token
-    multiple_instances: 3
-    run_level: highest
-    start_when_available: true
-    wake_to_run: false

roles/bash/templates/bashrc

@@ -110,13 +110,3 @@ 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 dnf package
+- name: install yum package
   become: true
-  dnf:
+  yum:
     name: bat
     state: latest

roles/bat/tasks/Windows.yaml

@@ -1,10 +1,5 @@
 ---
-- name: remove chocolatey package
+- name: install chocolatey package
   win_chocolatey:
     name: Bat
-    state: absent
+    state: latest
-
-- name: install scoop package
-  community.windows.win_scoop:
-    name: bat
-    state: present

roles/bat/tasks/deb.yaml

@@ -2,7 +2,6 @@
 - name: get latest github release
   uri:
     url: https://api.github.com/repos/sharkdp/bat/releases/latest
-    headers: '{{github_auth_headers}}'
   register: latest
 
 - set_fact:
@@ -51,7 +50,6 @@
   get_url:
     url: '{{asset.browser_download_url}}'
     dest: '{{bat_deb}}'
-  environment: '{{proxy_environment}}'
 
 - name: install .deb file
   when: installed_version is not defined or installed_version != latest_version

roles/cider/tasks/main.yaml

@@ -1,16 +0,0 @@
----
-- 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
-    state: latest

roles/curl/tasks/RedHat.yaml

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

roles/curl/tasks/Windows.yaml

@@ -1,10 +1,5 @@
 ---
-- name: remove chocolatey package
+- name: install chocolatey package
   win_chocolatey:
     name: curl
-    state: absent
+    state: latest
-
-- name: install scoop package
-  community.windows.win_scoop:
-    name: curl
-    state: present

roles/fd/tasks/main.yaml

@@ -1,32 +0,0 @@
----
-- 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: remove chocolatey package
-  when: ansible_os_family == 'Windows'
-  win_chocolatey:
-    name: fd
-    state: absent
-
-- name: install scoop package
-  when: ansible_os_family == 'Windows'
-  community.windows.win_scoop:
-    name: fd
-    state: present

roles/fedora-workstation/tasks/main.yaml

@@ -1,16 +0,0 @@
----
-- assert:
-    that: ansible_os_family == 'RedHat' and ansible_distribution == 'Fedora'
-
-- name: install non-free gstreamer plugins
-  become: true
-  dnf:
-    state: latest
-    allowerasing: true
-    name:
-      - ffmpeg
-      - gstreamer1-plugins-bad-free
-      - gstreamer1-plugins-bad-freeworld
-      - gstreamer1-plugins-base
-      - gstreamer1-plugins-good
-      - gstreamer1-plugins-ugly

roles/ferdium/tasks/Windows.yaml

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

@@ -1,17 +0,0 @@
----
-- 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
-    state: latest

roles/firefox/tasks/Ubuntu.yaml

@@ -1,52 +0,0 @@
----
-- 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
-  environment: '{{proxy_environment}}'
-
-- 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,5 +1,2 @@
 ---
-- include_tasks: Windows.yaml
+- include_tasks: '{{ansible_os_family}}.yaml'
-  when: ansible_os_family == 'Windows'
-- include_tasks: Ubuntu.yaml
-  when: ansible_distribution == 'Ubuntu'

roles/flatpak/tasks/Debian.yaml

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

roles/flatpak/tasks/RedHat.yaml

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

roles/flatpak/tasks/main.yaml

@@ -1,9 +0,0 @@
----
-- 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/Darwin.yaml

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

roles/fonts/tasks/Linux.yaml

@@ -17,7 +17,6 @@
 - name: get latest release
   uri:
     url: https://api.github.com/repos/ryanoasis/nerd-fonts/releases/latest
-    headers: '{{github_auth_headers}}'
   register: latest
 
 - set_fact:
@@ -37,7 +36,6 @@
   get_url:
     url: '{{asset.browser_download_url}}'
     dest: '{{ansible_env.HOME}}/.local/share/fonts/tmp.zip'
-  environment: '{{proxy_environment}}'
 
 - name: install Caskaydia Cove Nerd Font
   when: needs_installed

roles/fonts/tasks/Windows.yaml

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

roles/fonts/tasks/main.yaml

@@ -1,7 +1,5 @@
 ---
 - 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/Debian-old.yaml

@@ -9,16 +9,5 @@
 - name: create symbolic links
   file:
     state: link
-    src: '{{ item.src }}'
+    src: ~/.local/src/fzf/bin/fzf
-    dest: '{{ item.dest }}'
+    dest: ~/.local/bin/fzf
-  with_items:
-    - src: ~/.local/src/fzf/bin/fzf
-      dest: ~/.local/bin/fzf
-    - src: ~/.local/src/fzf/bin/fzf-tmux
-      dest: ~/.local/bin/fzf-tmux
-    - src: ~/.local/src/fzf/bin/fzf-preview.sh
-      dest: ~/.local/bin/fzf-preview.sh
-    - src: ~/.local/src/fzf/man/man1/fzf.1
-      dest: ~/.local/share/man/man1/fzf.1
-    - src: ~/.local/src/fzf/man/man1/fzf-tmux.1
-      dest: ~/.local/share/man/man1/fzf-tmux.1

roles/fzf/tasks/RedHat.yaml

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

roles/fzf/tasks/Windows.yaml

@@ -1,10 +1,5 @@
 ---
-- name: remove chocolatey package
+- name: install chocolatey package
   win_chocolatey:
     name: fzf
-    state: absent
+    state: latest
-
-- name: install scoop package
-  community.windows.win_scoop:
-    name: fzf
-    state: present

roles/gemini-cli/tasks/main.yaml

@@ -1,14 +0,0 @@
----
-- name: install homebrew package
-  when: ansible_os_family == 'Darwin'
-  homebrew:
-    state: latest
-    name: gemini-cli
-
-- name: install npm package
-  when: ansible_os_family != 'Darwin'
-  become: true
-  community.general.npm:
-    name: '@google/gemini-cli'
-    state: latest
-    global: true

roles/gh/tasks/Debian.yaml

@@ -15,7 +15,6 @@
     url: https://cli.github.com/packages/githubcli-archive-keyring.gpg
     dest: /usr/share/keyrings/githubcli-archive-keyring.gpg
     mode: 0644
-  environment: '{{proxy_environment}}'
 
 - name: add apt repository list
   become: true

roles/gh/tasks/RedHat.yaml

@@ -1,10 +1,9 @@
 ---
-- name: add dnf repository
+- 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
-  environment: '{{proxy_environment}}'
 
 - name: install dnf package
   become: true

roles/gh/tasks/Windows.yaml

@@ -1,10 +1,5 @@
 ---
-- name: remove chocolatey package
+- name: install chocolatey package
   win_chocolatey:
     name: gh
-    state: absent
+    state: latest
-
-- name: install scoop package
-  community.windows.win_scoop:
-    name: gh
-    state: present

roles/git/tasks/Windows-installer.yaml

@@ -2,7 +2,6 @@
 - 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
 
@@ -19,7 +18,6 @@
   win_get_url:
     url: '{{git_asset.browser_download_url}}'
     dest: '{{git_installer_path}}'
-  environment: '{{proxy_environment}}'
 
 - name: run installer command
   win_command:

roles/git/tasks/Windows.yaml

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

@@ -3,7 +3,7 @@
   git:
     repo: '{{item.repo}}'
     dest: '~/.config/{{item.name}}'
-    version: main
+    version: master
   with_items: '{{git_config_repos}}'
 
 - name: install homebrew packages

roles/git/vars/main.yaml

@@ -1,8 +1,8 @@
 ---
 git_config_repos:
-  - repo: git@git.infektor.net:config/git.git
+  - repo: git@code.infektor.net:config/git.git
     name: git
-  - repo: git@git.infektor.net:benie/config.git
+  - repo: git@code.infektor.net:benie/config.git
     name: private
 git_pip_packages:
   - git+https://github.com/kbenzie/git-issue.git

roles/gitea/tasks/Linux.yaml

@@ -1,50 +0,0 @@
----
-- 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'
-  environment: '{{proxy_environment}}'
-
-- name: install package
-  when: install_required
-  become: true
-  command:
-    cmd: 'stow --no-folding --target /usr/local .'
-    chdir: '{{tea_package_dir}}'

roles/gitea/tasks/main.yaml

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

@@ -1,4 +0,0 @@
----
-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/glab/tasks/Debian.yaml

@@ -6,7 +6,7 @@
     path: '{{glab}}'
   register: stat_glab
 
-- name: get install version
+- name: get instlal version
   when: stat_glab.stat.exists
   command: '{{glab}} --version'
   register: glab_version_output
@@ -31,9 +31,8 @@
     latest_version: '{{releases.json[0].tag_name}}'
     query: >
       [?contains(name, `glab`)] |
-      [?contains(name, `linux`)] |
+      [?contains(name, `Linux`)] |
-      [?contains(name, `{{
+      [?contains(name, `{{ansible_machine}}.deb`)] | [0]
-        {'x86_64': 'amd64', 'arm64': 'arm64'}[ansible_machine]}}.deb`)] | [0]
 - set_fact:
     asset: '{{latest.assets.links|json_query(query)}}'
 
@@ -49,7 +48,6 @@
   get_url:
     url: '{{asset.url}}'
     dest: '{{tempdir.path}}/glab.deb'
-  environment: '{{proxy_environment}}'
 
 - name: install .deb file
   when: glab_version is not defined or glab_version != latest_version
@@ -63,13 +61,7 @@
     state: absent
     path: '{{tempdir.path}}'
 
-- name: get zsh completions source
-  command: glab completion -s zsh
-  register: glab_zsh_completions
-  changed_when: false
-
 - name: install zsh completions
-  become: true
+  when: glab_version is not defined or glab_version != latest_version
-  copy:
+  command:
-    content: '{{glab_zsh_completions.stdout}}'
+    glab completion -s zsh > ~/.local/share/zsh/site-functions/_glab
-    dest: /usr/local/share/zsh/site-functions/_glab

roles/glab/tasks/Windows.yaml

@@ -1,12 +1,5 @@
 ---
-- name: remove chocolatey package
+- name: install chocolatey package
   win_chocolatey:
-    name:
-      - glab
-      - glab.portable
-    state: absent
-
-- name: install scoop package
-  community.windows.win_scoop:
     name: glab
-    state: present
+    state: latest

roles/gnome-shell/tasks/Ubuntu.yaml

@@ -1,18 +0,0 @@
----
-- name: ubuntu dock disable dock-fixed
-  gsettings:
-    schema: org.gnome.shell.extensions.dash-to-dock
-    key: dock-fixed
-    value: 'false'
-
-- name: ubuntu dock set dock-position to bottom
-  gsettings:
-    schema: org.gnome.shell.extensions.dash-to-dock
-    key: dock-position
-    value: "'BOTTOM'"
-
-- name: ubuntu dock disable extend-height
-  gsettings:
-    schema: org.gnome.shell.extensions.dash-to-dock
-    key: extend-height
-    value: 'false'

roles/gnome-shell/tasks/main.yaml

@@ -1,73 +0,0 @@
----
-- assert:
-    that: "'GNOME' in ansible_env.XDG_CURRENT_DESKTOP"
-
-- name: install packages
-  become: true
-  package:
-    name:
-      - gnome-tweaks
-      - gnome-themes-extra
-    state: latest
-
-- name: prefer dark mode
-  gsettings:
-    schema: org.gnome.desktop.interface
-    key: color-scheme
-    value: "'prefer-dark'"
-
-- name: disable activate-window-menu keybinding
-  gsettings:
-    schema: org.gnome.desktop.wm.keybindings
-    key: activate-window-menu
-    value: '@as []'
-
-- name: disable switch-input-source keybinding
-  gsettings:
-    schema: org.gnome.desktop.wm.keybindings
-    key: switch-input-source
-    value: '@as []'
-- name: disable switch-input-source-backward keybinding
-  gsettings:
-    schema: org.gnome.desktop.wm.keybindings
-    key: switch-input-source-backward
-    value: '@as []'
-
-# TODO: window full screen toggle keybinding
-
-# 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'
-
-- name: 1password quick access custom keybinding
-  dconf:
-    state: present
-    key: '/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/{{item.key}}'
-    value: '{{item.value}}'
-  with_items:
-    - {key: 'binding', value: "'<Shift><Alt>space'"}
-    - {key: 'command', value: "'1password --quick-access'"}
-    - {key: 'name', value: "'1Password Quick Access'"}
-
-- name: ulauncher toggle custom keybinding
-  dconf:
-    state: present
-    key: '/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/{{item.key}}'
-    value: '{{item.value}}'
-  with_items:
-    - {key: 'binding', value: "'<Alt>space'"}
-    - {key: 'command', value: "'ulauncher-toggle'"}
-    - {key: 'name', value: "'Ulauncher Toggle'"}
-
-- name: list of entries defining custom-keybindings
-  dconf:
-    state: present
-    key: '/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings'
-    value: "['/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/', '/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/']"
-
-- when: ansible_distribution == 'Ubuntu'
-  include_tasks: Ubuntu.yaml
-
-# TODO: install gnome extensions
-# TODO: /org/gnome/shell/extensions/quake-terminal/terminal-shortcut = ['<Super>space']

roles/hiddenbar/tasks/main.yaml

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

roles/jp/tasks/Darwin.yaml

@@ -2,7 +2,6 @@
 - name: get latest github release
   uri:
     url: https://api.github.com/repos/jmespath/jp/releases/latest
-    headers: '{{github_auth_headers}}'
   register: latest
 
 - set_fact:
@@ -40,4 +39,3 @@
     url: '{{asset.browser_download_url}}'
     dest: '{{jp_exe}}'
     mode: +x
-  environment: '{{proxy_environment}}'

roles/jp/tasks/RedHat.yaml

@@ -19,7 +19,6 @@
 - 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
@@ -50,4 +49,3 @@
     url: '{{asset.browser_download_url}}'
     dest: '{{ansible_env.HOME}}/.local/bin/jp'
     mode: '0755'
-  environment: '{{proxy_environment}}'

roles/jq/tasks/Windows.yaml

@@ -1,10 +1,5 @@
 ---
-- name: remove chocolatey package
+- name: install chocolatey package
   win_chocolatey:
     name: jq
-    state: absent
+    state: latest
-
-- name: install scoop package
-  community.windows.win_scoop:
-    name: jq
-    state: present

roles/kitty/tasks/Darwin.yaml

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

roles/kitty/tasks/Debian.yaml

@@ -1,108 +1,6 @@
 ---
-- name: remove apt package
+- name: install apt package
   become: true
   apt:
     name: kitty
-    state: absent
+    state: latest
-
-- name: get latest version
-  uri:
-    url: https://api.github.com/repos/kovidgoyal/kitty/releases/latest
-    headers: '{{github_auth_headers}}'
-  register: latest
-
-- set_fact:
-    kitty_latest_version: '{{latest.json.tag_name[1:]}}'
-    kitty_exe: /usr/local/bin/kitty
-    kitty_package_dir: /usr/local/stow/kitty
-
-- name: check if already installed
-  stat:
-    path: '{{kitty_exe}}'
-  register: kitty
-
-- name: get installed version
-  when: kitty.stat.exists
-  command: '{{kitty_exe}} --version'
-  register: kitty_version
-  changed_when: false
-
-- when: kitty.stat.exists
-  set_fact:
-    kitty_install_version:
-      '{{kitty_version.stdout | regex_replace("^.*(\d+\.\d+\.\d+).*$", "\1")}}'
-
-- set_fact:
-    kitty_asset_query: >
-      [? contains(name,
-        `kitty-{{kitty_latest_version}}-{{ansible_architecture}}.txz`)] | [0]
-
-- set_fact:
-    kitty_install_required: >
-      {{ kitty_install_version is not defined or
-        kitty_latest_version != kitty_install_version }}
-    kitty_asset: "{{ latest.json.assets | json_query(kitty_asset_query) }}"
-
-- name: uninstall package
-  when: kitty_install_required and kitty.stat.exists
-  become: true
-  command:
-    cmd: 'stow --delete --target /usr/local .'
-    chdir: '{{kitty_package_dir}}'
-
-- name: remove outdated package
-  when: kitty_install_required and kitty.stat.exists
-  become: true
-  file:
-    state: absent
-    path: '{{kitty_package_dir}}'
-
-- set_fact:
-    kitty_package_archive: '{{kitty_package_dir}}/{{kitty_asset.name}}'
-
-- name: create package directory
-  become: true
-  file:
-    state: directory
-    path: '{{kitty_package_dir}}'
-
-- name: download package
-  when: kitty_install_required
-  become: true
-  get_url:
-    url: '{{kitty_asset.browser_download_url}}'
-    dest: '{{kitty_package_archive}}'
-  environment: '{{proxy_environment}}'
-
-- name: decompress package
-  when: kitty_install_required
-  become: true
-  unarchive:
-    src: '{{kitty_package_archive}}'
-    dest: '{{kitty_package_dir}}'
-    owner: root
-    group: staff
-
-- name: remove package archive
-  when: kitty_install_required
-  become: true
-  file:
-    state: absent
-    path: '{{kitty_package_archive}}'
-
-# FIXME: This is bound to break something somewhere but on Ubuntu 22.04 this
-# file breaks a bunch of other stuff when the kitty package in installed in
-# /usr/local with stow so we delete it before stowing.
-- name: remove conflicting library
-  when: kitty_install_required
-  become: true
-  file:
-    state: absent
-    path: '{{kitty_package_dir}}/lib/libglib-2.0.so.0'
-
-- name: install package
-  when: kitty_install_required
-  become: true
-  command:
-    cmd: "stow --no-folding --target /usr/local --ignore='lib/.*$' ."
-    chdir: '{{kitty_package_dir}}'

roles/kitty/tasks/main.yaml

@@ -3,6 +3,5 @@
 
 - name: clone config repo
   git:
-    repo: git@git.infektor.net:config/kitty.git
+    repo: git@code.infektor.net:config/kitty.git
     dest: ~/.config/kitty
-    version: main

roles/llvm/tasks/Debian.yaml

@@ -1,17 +1,5 @@
 ---
-- 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

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

roles/llvm/tasks/Pop!_OS.yaml

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

roles/llvm/tasks/Ubuntu.yaml

@@ -2,7 +2,6 @@
 - 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
@@ -57,7 +56,6 @@
   get_url:
     url: https://apt.llvm.org/llvm-snapshot.gpg.key
     dest: '{{keyring}}'
-  environment: '{{proxy_environment}}'
 
 - name: add upstream deb repository
   become: true

roles/llvm/tasks/main.yaml

@@ -1,2 +1,5 @@
 ---
 - 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

@@ -1,11 +0,0 @@
----
-- assert:
-    that: ansible_os_family == 'Darwin'
-
-- name: disable creation of .DS_Store in directories
-  osx_defaults:
-    domain: com.apple.desktopservices
-    key: DSDontWriteNetworkStores
-    value: 'true'
-
-# TODO: ^Space Keyboard Shortcut for switching Input Sources

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

@@ -4,5 +4,5 @@
 
 - name: install homebrew cask
   homebrew_cask:
-    name: windows-app
+    name: microsoft-remote-desktop
     state: latest

roles/neovide/tasks/main.yaml

@@ -1,14 +0,0 @@
----
-- name: install homebrew package
-  when: ansible_os_family == 'Darwin'
-  homebrew_cask:
-    name: neovide-app
-    state: latest
-
-- name: install winget package
-  when: ansible_os_family == 'Winodws'
-  win_winget:
-    name: Neovide.Neovide
-    state: latest
-
-# TODO: install linux package

roles/neovim/tasks/Darwin.yaml

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

roles/neovim/tasks/Debian.yaml

@@ -1,119 +1,18 @@
 ---
-# Don't neovim packages because they are all behind, even Debian unstable.
+- name: add neovim stable ppa
-# Instead use the latest pre-build Linux package from GitHub, then stow them
+  when: ansible_distribution == 'Ubuntu' and
-# into /usr/local.
+        ansible_distribution_version == '20.04'
-
-- name: remove apt package
   become: true
-  apt:
+  apt_repository:
-    name: neovim
+    repo: ppa:neovim-ppa/stable
-    state: absent
+    update_cache: true
 
-- set_fact:
+- name: install apt package
-    old_package_dirs:
-      - /usr/local/lib/nvim/nvim-linux-x86_64
-      - /usr/local/stow/nvim/nvim-linux64
-
-- include_tasks: sudo-rmdir.yaml
-  with_items: '{{old_package_dirs}}'
-
-- name: install gnu stow for managing tar.gz package
   become: true
   apt:
     name:
-      - stow
+      - neovim
+      - python3-neovim
     state: latest
 
-- name: install python provider pip package
-  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-linux-x86_64.tar.gz`)]'
-    package_dir: '/usr/local/stow/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: remove nuisance mimeinfo.cache file
-  become: true
-  file:
-    path: /usr/local/stow/nvim/nvim-linux-x86_64/share/applications/mimeinfo.cache
-    state: absent
-
-- name: uninstall old package from /usr/local
-  when: uninstall_required
-  become: true
-  command:
-    cmd: 'stow --delete --target /usr/local .'
-    chdir: '{{package_dir}}/nvim-linux-x86_64'
-
-- name: remove old package
-  become: true
-  when: uninstall_required
-  file:
-    path: '{{package_dir}}/nvim-linux-x86_64'
-    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}}'
-  environment: '{{proxy_environment}}'
-
-- 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: install package to /usr/local
-  when: install_required
-  become: true
-  command:
-    cmd: 'stow --no-folding --target /usr/local .'
-    chdir: '{{package_dir}}/nvim-linux-x86_64'
-
 - include_tasks: Unix.yaml

roles/neovim/tasks/Unix-plugins.yaml

@@ -0,0 +1,36 @@
+---
+- name: clone plugin repos
+  git:
+    repo: 'https://github.com/{{item.repo}}.git'
+    dest: '{{plugin_dir}}/{{item.mode | default("start")}}/{{item.repo | regex_replace("^.*\/(.*)$", "\1")}}'
+    version: '{{item.branch | default("HEAD")}}'
+  with_items: '{{plugins}}'
+
+- name: get list of managed plugin paths
+  set_fact:
+    managed_plugins: >-
+      {{
+        managed_plugins | default([]) + [
+            plugin_dir + "/" +
+            item.mode | default("start") + "/" +
+            item.repo | regex_replace("^.*\/(.*)$", "\1")
+        ]
+      }}
+  with_items: '{{plugins}}'
+
+- name: find all installed plugin directories
+  find:
+    paths:
+      - '{{plugin_dir}}/start'
+      - '{{plugin_dir}}/opt'
+    file_type: directory
+  register: found_plugins
+
+- name: remove found plugins which are not in the managed list
+  file:
+    path: '{{item.path}}'
+    state: absent
+  with_items: '{{found_plugins.files}}'
+  when: item.path not in managed_plugins
+  loop_control:
+    label: '{{item.path}}'

roles/neovim/tasks/Unix.yaml

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

roles/neovim/tasks/Windows-plugins.yaml

@@ -0,0 +1,36 @@
+---
+- name: clone plugin repos
+  win_git:
+    repo: 'https://github.com/{{item.repo}}.git'
+    dest: '{{plugin_dir}}/{{item.mode | default("start")}}/{{item.repo | regex_replace("^.*\/(.*)$", "\1")}}'
+    branch: '{{item.branch | default("HEAD")}}'
+  with_items: '{{plugins}}'
+
+- name: get list of managed plugin paths
+  set_fact:
+    managed_plugins: >-
+      {{
+        managed_plugins | default([]) + [
+            plugin_dir + "/" +
+            item.mode | default("start") + "/" +
+            item.repo | regex_replace("^.*\/(.*)$", "\1")
+        ]
+      }}
+  with_items: '{{plugins}}'
+
+- name: find all start plugin directories
+  win_find:
+    paths:
+      - '{{plugin_dir}}/start'
+      - '{{plugin_dir}}/opt'
+    file_type: directory
+  register: found_plugins
+
+- name: remove found plugins which are not in the managed list
+  win_file:
+    path: '{{item.path}}'
+    state: absent
+  with_items: '{{found_plugins.files}}'
+  when: item.path not in managed_plugins
+  loop_control:
+    label: '{{item.path}}'

roles/neovim/tasks/Windows.yaml

@@ -1,34 +1,59 @@
 ---
-- name: install winget packages
-  win_winget:
-    name:
-      - neovim.neovim
-      - equalsraf.neovim-qt
-    state: latest
 
-- name: remove chocolatey package
+- name: install chocolatey packages
   win_chocolatey:
     name: neovim
-    state: absent
+    state: latest
 
 - set_fact:
     vim_config_dir: '{{ansible_env.LOCALAPPDATA}}\nvim'
 
-- name: clone config repo
+# - name: clone config repo
-  win_git:
+#   win_git:
-    repo: git@git.infektor.net:config/nvim.git
+#     repo: git@code.infektor.net:config/vim.git
-    dest: '{{vim_config_dir}}'
+#     dest: '{{vim_config_dir}}'
-    branch: main
+#     branch: master
+#     # clone: false
+#     update: true
+# - win_owner:
+#     path: '{{vim_config_dir}}'
+#     user: Benie
+#     recurse: true
 
-# TODO: Create neovim-qt start menu shortcut
+# - TODO: neovim set repo email
-# Need a reliable way to get the path to nvim-qt which doesn't reply on
+#   win_git_config:
-# where.exe or similar as it won't work on first install due to environment
+# - TODO: neovim install pip packages
-# variable update. winget installs the equalsraf.neovim-qt package in
+#   win_pip:
-# {{ansible_env.ProgramFiles}}\neovim-qt {{neovim_qt_version}}\bin\nvim.qt.exe
+#     name: '{{neovim_pip_packages}}'
-# so if I can get the version out of winget that would be a start.
+#     state: latest
-# - name: create nvim start menu shortcut
+
-#   win_shortcut:
+- name: create nvim start menu shortcut
-#     src: '{{neovim_qt_exe}}'
+  win_shortcut:
-#     dest: '{{ansible_env.ProgramData}}/Microsoft/Windows/Start Menu/Programs/nvim-qt.lnk'
+    src: '{{ansible_env.ChocolateyToolsLocation}}/neovim/nvim-win64/bin/nvim-qt.exe'
-#     icon: '{{neovim_qt_exe}},0'
+    dest: '{{ansible_env.ProgramData}}/Microsoft/Windows/Start Menu/Programs/nvim-qt.lnk'
-#     directory: '{{ansible_env.USERPROFILE}}'
+    icon: '{{ansible_env.ChocolateyToolsLocation}}/neovim/nvim-win64/bin/nvim-qt.exe,0'
+    directory: '{{ansible_env.USERPROFILE}}'
+
+- name: check for config repo tasks.yaml
+  win_stat:
+    path: '{{vim_config_dir}}/tasks.yaml'
+  register: config_repo_tasks
+
+# TODO: this doesn't work for non localhost setups
+# probably need to copy the tasks.yaml and plugins.yaml to the controller in a
+# temporary directory then include them
+- when: config_repo_tasks.stat.exists
+  fetch:
+    src: '{{vim_config_dir}}/tasks.yaml'
+    dest: vim_config_tasks.yaml
+    flat: true
+
+- when: config_repo_tasks.stat.exists
+  include_tasks: vim_config_tasks.yaml
+
+- when: ansible_os_family != "Windows" and
+        plugin_dir is defined and plugins is defined
+  include_tasks: 'Unix-plugins.yaml'
+- when: ansible_os_family == "Windows" and
+        plugin_dir is defined and plugins is defined
+  include_tasks: 'Windows-plugins.yaml'

roles/neovim/tasks/sudo-rmdir.yaml

@@ -1,19 +0,0 @@
----
-- name: check if {{item}} exists
-  stat:
-    path: '{{item}}'
-  register: old_package
-
-- name: uninstall package from {{item}}
-  when: old_package.stat.exists
-  become: true
-  command:
-    cmd: 'stow --delete --target /usr/local .'
-    chdir: '{{item}}'
-
-- name: remove {{item}}
-  when: old_package.stat.exists
-  become: true
-  file:
-    state: absent
-    path: '{{item}}'

roles/neovim/vars/main.yaml

@@ -1,3 +1,7 @@
 ---
 neovim_pip_packages:
+  - cmake-language-server
+  - cmakelint
   - compdb
+  - vim-vint
+  - yamllint

roles/nodejs/tasks/Debian.yaml

@@ -13,7 +13,6 @@
   get_url:
     url: 'https://nodejs.org/dist/{{latest.json[0].version}}/node-{{latest.json[0].version}}-linux-x64.tar.gz'
     dest: ~/.local/src/node/node.tar.gz
-  environment: '{{proxy_environment}}'
 
 - name: extract downloaded package
   unarchive:

roles/nodejs/tasks/RedHat.yaml

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

roles/nvtop/tasks/install-appimage.yaml

@@ -1,40 +0,0 @@
----
-- name: get latest github release
-  uri:
-    url: https://api.github.com/repos/Syllo/nvtop/releases/latest
-    headers: '{{github_auth_headers}}'
-  register: latest
-
-- set_fact:
-    asset_query: '[?contains(name, `x86_64.AppImage`)] | [0]'
-    assets: '{{latest.json.assets}}'
-    latest_version: '{{latest.json.tag_name}}'
-    nvtop_exe: '/usr/local/bin/nvtop'
-
-- name: check if already installed
-  stat:
-    path: '{{nvtop_exe}}'
-  register: nvtop_stat
-
-- name: get installed version
-  when: nvtop_stat.stat.exists == True
-  command: '{{nvtop_exe}} --version'
-  register: nvtop_version_output
-  changed_when: false
-
-- when: nvtop_stat.stat.exists == True
-  set_fact:
-    installed_version:
-      '{{nvtop_version_output.stdout.strip() | regex_replace("^.*(\d+\.\d+\.\d+).*$", "\1")}}'
-
-- set_fact:
-    asset: '{{assets | to_json | from_json | json_query(asset_query)}}'
-
-- name: download executable
-  when: installed_version is not defined or installed_version != latest_version
-  become: true
-  get_url:
-    url: '{{asset.browser_download_url}}'
-    dest: '{{nvtop_exe}}'
-    mode: +x
-  environment: '{{proxy_environment}}'

roles/nvtop/tasks/main.yaml

@@ -1,10 +0,0 @@
----
-- name: install dnf package
-  when: ansible_os_family == 'RedHat'
-  become: true
-  dnf:
-    state: latest
-    name: nvtop
-
-- when: ansible_os_family != 'RedHat'
-  include_tasks: install-appimage.yaml

roles/obsidian/tasks/Linux.yaml

@@ -1,33 +1,75 @@
 ---
-- name: install flatpak package
+# TODO: Prefer Flatpak over AppImage if available
-  become: true
-  flatpak:
-    name: md.obsidian.Obsidian
-    state: latest
 
-# Remove old appimage if it exists
+- name: stat symlink
-- 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'
-- name: remove appimage icon file
+    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
   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}}'
-    state: absent
+
-- name: remove appimage desktop file
+- name: remove squashfs-root directory
+  when: needs_installed
   file:
-    dest: '{{ansible_env.HOME}}/.local/share/applications/obsidian-obsidian.desktop'
+    path: '/tmp/squashfs-root'
     state: absent
+
+- 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: "'lnk_source' in symlink_file.stat"
+  when: needs_installed and symlink_file.stat.exists
   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,3 +12,7 @@
     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={{ansible_env.HOME}}/.local/{{iconpath}}
+Icon=obsidian
 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

@@ -1,26 +0,0 @@
----
-- 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,14 +5,18 @@
 
 - name: clone config repos
   win_git:
-    repo: git@git.infektor.net:config/WindowsPowerShell.git
+    repo: git@code.infektor.net:config/WindowsPowerShell.git
     dest: '{{powershell_config_dir}}'
-    branch: main
+    branch: master
+- win_owner:
+    path: '{{powershell_config_dir}}'
+    user: Benie
+    recurse: true
 
-- name: remove cmder chocolatey package
+- name: install chocolatey package
   win_chocolatey:
     name: Cmder
-    state: absent
+    state: latest
 
 - name: get NuGet package provider
   ansible.windows.win_powershell:
@@ -38,14 +42,3 @@
     name: posh-git
     state: latest
     accept_license: true
-
-- name: install pwsh for powershell lsp
-  community.windows.win_scoop:
-    name: pwsh
-    state: present
-
-- name: run install script
-  win_command:
-    cmd: 'powershell.exe {{powershell_config_dir}}/install.ps1'
-  register: powershell_install
-  changed_when: "'changed' in powershell_install.stdout"

roles/python/tasks/RedHat.yaml

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

roles/python/tasks/Unix.yaml

@@ -1,15 +1,11 @@
 ---
-- name: stat old config repo
+- name: install config repo
-  stat:
+  git:
-    path: ~/.config/python/.git
+    repo: git@code.infektor.net:config/python.git
-  register: config_python_git
-
-- name: remove old config repo
-  when: config_python_git.stat.exists
-  file:
-    state: absent
     dest: ~/.config/python
 
+# TODO: set repo email
+
 - name: create config directories
   file:
     state: directory
@@ -19,45 +15,34 @@
     - ~/.config/ipython/profile_default
     - ~/.config/pip
 
-- name: stat pip.conf
+# Ensure that pip.conf exists before ever installing pip packages since
-  stat:
+# Debian has enabled `EXTERNALLY-MANAGED` from PEP 668 which breaks `pip
-    path: ~/.config/pip/pip.conf
+# install --user` unless configured otherwise.
-  register: pip_conf
+- name: create symbolic links
-
-- name: remove pip.conf if its a symbolic link
-  when: pip_conf.stat.exists and pip_conf.stat.islnk
   file:
-    state: absent
+    state: link
-    path: ~/.config/pip/pip.conf
+    src: '{{item.src}}'
-
+    dest: '{{item.dest}}'
-# Ensure that pip.conf exists before ever installing pip packages since Debian
+  with_items:
-# has enabled `EXTERNALLY-MANAGED` from PEP 668 which breaks `pip install
+    - src: ~/.config/python/flake8
-# --user` unless configured otherwise.
+      dest: ~/.config/flake8
-- name: create user pip.conf from template
+    - src: ~/.config/python/pylintrc
-  template:
+      dest: ~/.pylintrc
-    src: pip.conf.j2
+    - src: ~/.config/python/ipython_config.py
-    dest: ~/.config/pip/pip.conf
+      dest: ~/.config/ipython/profile_default/ipython_config.py
-
+    - src: ~/.config/python/pip.conf
-# TODO: Also configure pip to disable `EXTERNALLY-MANAGED` globally?
+      dest: ~/.config/pip/pip.conf
-
-- name: stat old ipython_config.py
-  stat:
-    path: ~/.config/ipython/profile_default/ipython_config.py
-  register: ipython_config_py
-
-- name: remove ipython_conifg.py if its a symbolic link
-  when: ipython_config_py.stat.exists and ipython_config_py.stat.islnk
-  file:
-    state: absent
-    path: ~/.config/ipython/profile_default/ipython_config.py
-
-- name: create ipython config from template
-  template:
-    src: ipython_config.py
-    dest: ~/.config/ipython/profile_default/ipython_config.py
 
 - name: install pip packages
   pip:
     name: '{{python_pip_packages}}'
     state: latest
     extra_args: --user
+
+- name: create directories
+  file:
+    state: directory
+    dest: '{{item}}'
+  with_items:
+    - ~/.config/ipython/profile_default
+    - ~/.config/pip