Add flatpak role for Debian

Ansible facts aren't always enough to determine if a distro is derived
from Ubuntu or not, this is available from `/etc/os-release` when it
contains `ID_LIKE="ubuntu debian"`. This patch uses `/etc/os-release` to
correctly handle Ubuntu installations, e.g. PPA's, for all Ubuntu
derived dirtros rather than just Ubuntu itself.

.gitignore

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

ansible.cfg

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

library/win_git.ps1

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

library/win_git.py

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

playbooks/Linux.yaml

@@ -3,5 +3,6 @@
 - import_playbook: UnixGUI.yaml
 - hosts: localhost
   roles:
-    - role: gnome-shell
     - role: kitty
+    - role: xremap
+      when: ansible_os_family == "RedHat"

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

@@ -1,9 +1,6 @@
 ---
 - hosts: windows
 
-  vars:
-    install_cad_apps: false
-
   roles:
     - role: python
     - role: git
@@ -16,6 +13,7 @@
     - role: curl
     - role: fzf
     - role: gh
+    - role: glab
     - role: jq
     - role: tree
     - role: yq
@@ -25,12 +23,9 @@
 
     - role: 1password
     - role: autohotkey
+    - role: ferdium
     - role: firefox
+    - role: fonts
     - role: obsidian
     - role: powertoys
     - role: windows-terminal
-
-    - role: autodesk-fusion360
-      when: install_cad_apps
-    - role: prusaslicer
-      when: install_cad_apps

roles/1password/tasks/Debian.yaml

@@ -1,16 +1,24 @@
 ---
-- set_fact:
+- name: set keyring path
-    keyring: /etc/apt/trusted.gpg.d/1password-archive-keyring.gpg
+  set_fact:
+    keyring: /etc/apt/keyrings/1password.asc
+    old_keyring: /etc/apt/trusted.gpg.d/1password-archive-keyring.gpg
+
+- name: remove old keyring
+  become: true
+  file:
+    path: '{{old_keyring}}'
+    state: absent
 
 - name: add apt signing key
   when: '"WSL" not in ansible_kernel'
   become: true
-  apt_key:
+  get_url:
     url: https://downloads.1password.com/linux/keys/1password.asc
-    keyring: '{{keyring}}'
+    dest: '{{keyring}}'
-    state: present
 
-- when: ansible_machine == 'x86_64'
+- name: set compatible architecture
+  when: ansible_machine == 'x86_64'
   set_fact:
     arch: amd64
 
@@ -21,11 +29,16 @@
 - name: add apt repository
   when: '"WSL" not in ansible_kernel'
   become: true
-  apt_repository:
+  copy:
-    repo: >-
+    content: >-
       deb [arch={{arch}} signed-by={{keyring}}]
       https://downloads.1password.com/linux/debian/{{arch}} stable main
-    filename: 1password
+    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'

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

@@ -1,8 +0,0 @@
----
-- assert:
-    that: ansible_os_family == "Windows"
-
-- name: install chocolatey package
-  win_chocolatey:
-    name: autodesk-fusion360
-    state: latest

roles/autohotkey/tasks/main.yaml

@@ -9,10 +9,6 @@
     repo: git@code.infektor.net:config/AutoHotKey.git
     dest: '{{autohotkey_repo_dir}}'
     branch: master
-- win_owner:
-    path: '{{autohotkey_repo_dir}}'
-    user: Benie
-    recurse: true
 
 - name: create scheduled task
   win_scheduled_task:

roles/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/flatpak/tasks/Debian.yaml

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

roles/flatpak/tasks/main.yaml

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

roles/fonts/tasks/Windows.yaml

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

roles/fonts/tasks/main.yaml

@@ -1,5 +1,7 @@
 ---
 - when: ansible_os_family == 'Darwin'
   include_tasks: 'Darwin.yaml'
+- when: ansible_os_family == 'Windows'
+  include_tasks: 'Windows.yaml'
 - when: ansible_os_family != 'Darwin' and ansible_os_family != 'Windows'
   include_tasks: 'Linux.yaml'

roles/git/tasks/Windows.yaml

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

roles/gnome-shell/tasks/main.yaml

@@ -1,8 +0,0 @@
----
-- dconf:
-    # key: /org/gnome/settings-daemon/plugins/media-keys/custom-keybindings
-    key: '/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0'
-    state: read
-  register: custom_keybindins
-
-- debug: msg={{custom_keybindins}}

roles/llvm/tasks/Debian.yaml

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

roles/llvm/tasks/Linux Mint.yaml

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

roles/llvm/tasks/Pop!_OS.yaml

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

roles/llvm/tasks/Ubuntu.yaml

@@ -25,11 +25,44 @@
       'http://apt.llvm.org/{{ubuntu_codename}}/'
     llvm_apt_category:
       'llvm-toolchain-{{ubuntu_codename}}-{{llvm_major_version}}'
+    keyring: '/etc/apt/keyrings/llvm.asc'
+
+- name: remove old keyring
+  when: '"WSL" not in ansible_kernel'
+  become: true
+  apt_key:
+    url: https://apt.llvm.org/llvm-snapshot.gpg.key
+    id: 6084F3CF814B57C1CF12EFD515CF4D18AF4F7421
+    state: absent
+
+- name: remove old upstream deb repository
+  become: true
+  apt_repository:
+    repo: 'deb {{llvm_apt_repo_url}} {{llvm_apt_category}} main'
+    state: absent
+    filename: llvm
+    update_cache: false
+
+- name: remove old upstream deb-src repository
+  become: true
+  apt_repository:
+    repo: 'deb-src {{llvm_apt_repo_url}} {{llvm_apt_category}} main'
+    state: absent
+    filename: llvm
+    update_cache: false
+
+- name: add apt repository key
+  become: true
+  get_url:
+    url: https://apt.llvm.org/llvm-snapshot.gpg.key
+    dest: '{{keyring}}'
 
 - name: add upstream deb repository
   become: true
   apt_repository:
-    repo: 'deb {{llvm_apt_repo_url}} {{llvm_apt_category}} main'
+    repo: >
+      deb [signed-by={{keyring}}]
+      {{llvm_apt_repo_url}} {{llvm_apt_category}} main
     state: present
     filename: llvm
     update_cache: false
@@ -37,18 +70,13 @@
 - name: add upstream deb-src repository
   become: true
   apt_repository:
-    repo: 'deb-src {{llvm_apt_repo_url}} {{llvm_apt_category}} main'
+    repo: >
+      deb-src [signed-by={{keyring}}]
+      {{llvm_apt_repo_url}} {{llvm_apt_category}} main
     state: present
     filename: llvm
     update_cache: false
 
-- name: add apt repository key
-  become: true
-  apt_key:
-    url: https://apt.llvm.org/llvm-snapshot.gpg.key
-    id: 6084F3CF814B57C1CF12EFD515CF4D18AF4F7421
-    state: present
-
 - name: update apt cache
   become: true
   apt:

roles/llvm/tasks/main.yaml

@@ -1,5 +1,2 @@
 ---
 - include_tasks: '{{ansible_os_family}}.yaml'
-  when: ansible_os_family in ['Darwin', 'Windows']
-- include_tasks: '{{ansible_distribution}}.yaml'
-  when: ansible_os_family not in ['Darwin', 'Windows']

roles/neovim/tasks/Debian.yaml

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

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

@@ -1,4 +1,6 @@
 ---
+# TODO: Prefer Flatpak over AppImage if available
+
 - name: stat symlink
   stat:
     path: '{{ansible_env.HOME}}/.local/bin/Obsidian'
@@ -13,6 +15,7 @@
     appimage: 'Obsidian-{{latest.json.name}}.AppImage'
 - set_fact:
     filepath: '{{ansible_env.HOME}}/.local/bin/{{appimage}}'
+    iconpath: 'share/icons/hicolor/512x512/apps/obsidian.png'
     asset_query: '[?contains(name, `{{appimage}}`)] | [0]'
 - set_fact:
     needs_installed:
@@ -25,13 +28,37 @@
     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
 
-# TODO: icon for desktop file
+- name: extract squashfs-root for app icon
+  when: needs_installed
+  command:
+    cmd: '{{ansible_env.HOME}}/.local/bin/Obsidian --appimage-extract'
+    chdir: '/tmp'
+
+- name: copy icon file
+  when: needs_installed
+  copy:
+    src: '/tmp/squashfs-root/usr/{{iconpath}}'
+    dest: '{{ansible_env.HOME}}/.local/{{iconpath}}'
+
+- name: remove squashfs-root directory
+  when: needs_installed
+  file:
+    path: '/tmp/squashfs-root'
+    state: absent
 
 - name: create desktop file
   template:

roles/obsidian/tasks/Windows.yaml

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

roles/obsidian/tasks/main.yaml

@@ -1,2 +1,5 @@
 ---
 - include_tasks: '{{ansible_os_family}}.yaml'
+  when: ansible_os_family == "Darwin" or ansible_os_family == "Windows"
+- include_tasks: 'Linux.yaml'
+  when: ansible_os_family != "Darwin" and ansible_os_family != "Windows"

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

@@ -1,14 +0,0 @@
----
-- assert:
-    that: ansible_os_family == "Windows"
-
-- name: install chocolatey package
-  win_chocolatey:
-    name: prusaslicer
-    state: latest
-
-- name: create start menu shortcut
-  win_shortcut:
-    src: '{{ansible_env.ProgramData}}/chocolatey/bin/prusa-slicer.exe'
-    dest: '{{ansible_env.ProgramData}}/Microsoft/Windows/Start Menu/Programs/PrusaSlicer.lnk'
-    icon: '{{ansible_env.ProgramData}}/chocolatey/bin/prusa-slicer.exe,0'

roles/webcatalog/tasks/Linux.yaml

@@ -16,6 +16,7 @@
     appimage: 'WebCatalog-{{releases[0].version}}.AppImage'
 - set_fact:
     filepath: '{{ansible_env.HOME}}/.local/bin/{{appimage}}'
+    iconpath: 'share/icons/hicolor/512x512/apps/webcatalog.png'
 
 - set_fact:
     needs_installed:
@@ -28,13 +29,37 @@
     dest: '{{ansible_env.HOME}}/.local/bin/{{appimage}}'
     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/WebCatalog'
     state: link
 
-# TODO: icon for desktop file
+- name: extract squashfs-root for app icon
+  when: needs_installed
+  command:
+    cmd: '{{ansible_env.HOME}}/.local/bin/WebCatalog --appimage-extract'
+    chdir: '/tmp'
+
+- name: copy icon file
+  when: needs_installed
+  copy:
+    src: '/tmp/squashfs-root/usr/{{iconpath}}'
+    dest: '{{ansible_env.HOME}}/.local/{{iconpath}}'
+
+- name: remove squashfs-root directory
+  when: needs_installed
+  file:
+    path: '/tmp/squashfs-root'
+    state: absent
 
 - name: create desktop file
   template:

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,25 +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
-
-- name: create ansible modules directory
-  file:
-    dest: ~/.ansible/plugins/modules
-    state: directory
-
-- name: copy win_git files to ansible modules directory
-  copy:
-    src: '~/.config/local/external/ansible-win_git/{{item}}'
-    dest: '~/.config/local/modules/{{item}}'
-  with_items:
-    - win_git.ps1
-    - win_git.py
-
 - name: read /etc/resolv.conf file contents
   set_fact:
     resolv_conf: '{{lookup("ansible.builtin.file", "/etc/resolv.conf")}}'

roles/xremap/handlers/main.yaml

@@ -0,0 +1,7 @@
+---
+- name: restart xremap
+  systemd:
+    name: xremap
+    scope: user
+    daemon_reload: true
+    state: restarted

roles/xremap/tasks/main.yaml

@@ -0,0 +1,123 @@
+---
+- assert:
+    that: ansible_env.XDG_CURRENT_DESKTOP == "GNOME" and
+          ansible_env.XDG_SESSION_TYPE == "wayland"
+
+- set_fact:
+    install_dir: '{{ansible_env.HOME}}/.local/bin'
+    config_dir: '{{ansible_env.HOME}}/.config/xremap'
+- set_fact:
+    executable_path: '{{install_dir}}/xremap'
+
+- name: stat executable
+  stat:
+    path: '{{executable_path}}'
+  register: executable
+
+- name: get installed version
+  when: executable.stat.exists
+  command: '{{executable_path}} --version'
+  register: version_command
+  changed_when: false
+
+- name: extract version from command output
+  when: executable.stat.exists
+  set_fact:
+    installed_version:
+      'v{{version_command.stdout.strip() | regex_replace("^.*(\d+\.\d+\.\d+).*$", "\1")}}'
+
+- name: get latest release
+  uri:
+    url: https://api.github.com/repos/k0kubun/xremap/releases/latest
+  register: latest
+
+- name: determine if install needed
+  set_fact:
+    needs_installed:
+      '{{not executable.stat.exists or installed_version != latest.json.name}}'
+
+- name: construct asset query
+  set_fact:
+    asset_query: >
+      [?contains(name, `xremap-linux-{{ansible_architecture}}-{{
+                     ansible_env.XDG_CURRENT_DESKTOP | lower}}.zip`)] | [0]
+- name: get release asset
+  set_fact:
+    asset: '{{latest.json.assets | to_json | from_json | json_query(asset_query)}}'
+
+- name: create directories
+  file:
+    path: '{{item}}'
+    state: directory
+  with_items:
+    - '{{install_dir}}'
+    - '{{config_dir}}'
+
+- name: download release archive
+  when: needs_installed
+  become: true
+  get_url:
+    url: '{{asset.browser_download_url}}'
+    dest: '{{install_dir}}/xremap.zip'
+
+- name: extract release archive
+  when: needs_installed
+  become: true
+  unarchive:
+    src: '{{install_dir}}/xremap.zip'
+    dest: '{{install_dir}}'
+
+- name: remove release archive
+  when: needs_installed
+  become: true
+  file:
+    path: '{{install_dir}}/xremap.zip'
+    state: absent
+
+- name: add user to input group
+  become: true
+  user:
+    name: '{{ansible_user_id}}'
+    append: true
+    groups: input
+
+# TODO: This works for on Fedora, author uses it on Ubuntu so I assume Debian
+# will work too. Arch and other distros are potentially different see the docs
+# https://github.com/k0kubun/xremap
+- name: add udev rule for input access
+  become: true
+  copy:
+    content: |
+      KERNEL=="uinput", GROUP="input", TAG+="uaccess"
+    dest: /etc/udev/rules.d/input.rules
+
+- name: clone config repo
+  git:
+    repo: git@code.infektor.net:config/xremap.git
+    dest: '{{config_dir}}'
+  notify: restart xremap
+
+- name: install xremap systemd unit
+  template:
+    src: xremap.service.j2
+    dest: ~/.config/systemd/user/xremap.service
+  notify: restart xremap
+
+- name: enable xremap service
+  systemd:
+    name: xremap
+    scope: user
+    enabled: true
+    state: started
+
+- name: check if extension is installed
+  command: gnome-extensions show xremap@k0kubun.com
+  changed_when: false
+  failed_when: false
+  register: extension
+
+- when: extension.rc != 0
+  debug:
+    msg: 'install gnome extension then reboot:
+        https://extensions.gnome.org/extension/5060/xremap'
+  changed_when: true

roles/xremap/templates/xremap.service.j2

@@ -0,0 +1,10 @@
+[Unit]
+Description=macOS Key Remapping
+
+[Service]
+Type=simple
+ExecStart={{executable_path}} {{config_dir}}/macOS.yaml
+Restart=on-failure
+
+[Install]
+WantedBy=default.target