Fix 1password role on Windows

When 1password is already installed and the installer is invoked, it
hangs because it launches the GUI and never returns.

.gitignore

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

ansible.cfg

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

library/win_git.ps1

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

library/win_git.py

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

playbooks/UnixGUI.yaml

@@ -2,6 +2,6 @@
 - hosts: localhost
   roles:
     - role: 1password
+    - role: ferdium
     - role: fonts
     - role: obsidian
-    - role: webcatalog

playbooks/WSL.yaml

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

playbooks/Windows.yaml

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

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

@@ -0,0 +1,17 @@
+---
+- name: install homebrew package
+  when: ansible_os_family == 'Darwin'
+  homebrew_cask:
+    name: ferdium
+    state: latest
+
+- when: ansible_os_family == 'Windows'
+  win_chocolatey:
+    name: ferdium
+    state: latest
+
+- name: install flatpak package
+  when: ansible_os_family != 'Windows' and
+        ansible_os_family != 'Darwin'
+  flatpak:
+    name: org.ferdium.Ferdium

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/git/tasks/Windows.yaml

@@ -37,11 +37,6 @@
     dest: '{{ansible_env.USERPROFILE}}/.config/{{item.name}}'
     version: master
   with_items: '{{git_config_repos}}'
-- win_owner:
-    path: '{{ansible_env.USERPROFILE}}/.config/{{item.name}}'
-    user: Benie
-    recurse: true
-  with_items: '{{git_config_repos}}'
 
 # - TODO: install pip packages
 #   win_pip:

roles/neovim/tasks/Windows-plugins.yaml

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

roles/neovim/tasks/Windows.yaml

@@ -13,15 +13,6 @@
     repo: git@code.infektor.net:config/vim.git
     dest: '{{vim_config_dir}}'
     branch: master
-    # clone: false
-    update: true
-- win_owner:
-    path: '{{vim_config_dir}}'
-    user: Benie
-    recurse: true
-
-- assert:
-    that: False
 
 # - TODO: neovim set repo email
 #   win_git_config:
@@ -50,10 +41,18 @@
     src: '{{vim_config_dir}}/tasks.yaml'
     dest: vim_config_tasks.yaml
     flat: true
+  changed_when: false
 
 - when: config_repo_tasks.stat.exists
   include_tasks: vim_config_tasks.yaml
 
+- name: remove fetched tasks
+  file:
+    state: absent
+    path: vim_config_tasks.yaml
+  changed_when: false
+  delegate_to: localhost
+
 - when: ansible_os_family != "Windows" and
         plugin_dir is defined and plugins is defined
   include_tasks: 'Unix-plugins.yaml'

roles/obsidian/templates/obsidian.desktop.j2

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

roles/powershell/tasks/main.yaml

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

roles/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")}}'