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.

library/win_git.ps1

@@ -127,14 +127,6 @@ function Invoke-GitClone {
     if ($result.rc -ne 0) {
         $module.FailJson($result.stderr)
     }
-    # Ensure the newly cloned repository has the correct owner
-    $userName = [System.Security.Principal.WindowsIdentity]::GetCurrent().Name
-    $idRef = [System.Security.Principal.NTAccount]::new($userName)
-    Get-Item $dest | foreach { `
-        $_ ; $_ | Get-ChildItem -Force -Recurse `
-    } | foreach { `
-        $acl = $_ | Get-Acl; $acl.SetOwner($idRef); $_ | Set-Acl -AclObject $acl `
-    }
 }
 
 function Invoke-GitCheckout {
@@ -228,4 +220,13 @@ 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()

playbooks/Windows.yaml

@@ -25,6 +25,7 @@
     - role: autohotkey
     - role: ferdium
     - role: firefox
+    - role: fonts
     - role: obsidian
     - role: powertoys
     - role: windows-terminal

roles/1password/tasks/Debian.yaml

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

roles/1password/tasks/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/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/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/llvm/tasks/Debian.yaml

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

roles/llvm/tasks/Linux Mint.yaml

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

roles/llvm/tasks/Pop!_OS.yaml

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

roles/llvm/tasks/main.yaml

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

roles/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
-        ansible_distribution_version == '20.04'
+  when: "'ID_LIKE' in os_release and os_release.ID_LIKE == 'ubuntu debian'"
   become: true
   apt_repository:
     repo: ppa:neovim-ppa/stable

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