Replace Magnet with Rectangle

Injecting facts as variables is being deprecated by default, override
this in `ansible.cfg` to silence deprecation warnings.

.gitignore

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

ansible.cfg

@@ -2,4 +2,5 @@
 collections_path = collections
 library = library
 roles_path = roles
-stdout_callback = yaml
+callback_result_format = yaml
+inject_facts_as_vars = True

library/tuck.py

@@ -0,0 +1,121 @@
+# -*- coding: utf-8 -*-
+
+import os
+import subprocess
+from os import environ
+from pathlib import Path
+
+import requests
+from ansible.module_utils.basic import AnsibleModule
+
+DOCUMENTATION = """
+module: tuck
+author:
+    - Kenneth Benzie (Benie)
+short_description: Ansible kmodule for the tuck tool
+options:
+    name:
+        description:
+            - GitHub project name of the package to manage
+        type: str
+    state:
+        description:
+            - Desired state of the package
+        type: str
+        choices:
+            - "latest"
+            - "absent"
+"""
+
+EXAMPLES = """
+- name: install package
+  tuck:
+    name: kbenzie/tuck
+    state: present
+
+- name: uninstall package
+  tuck:
+    name: kbenzie/tuck
+    state: absent
+"""
+
+
+def installed(tuck) -> list[str]:
+    result = subprocess.run(
+        [tuck, "list", "--quiet"],
+        capture_output=True,
+        check=True,
+    )
+    return result.stdout.decode("utf-8").split("\n")
+
+
+def present(tuck: Path, package: str) -> dict:
+    if package in installed(tuck):
+        return dict(changed=False)
+    return latest(tuck, package)
+
+
+def latest(tuck: Path, package: str) -> dict:
+    result = subprocess.run(
+        [tuck, "install", package],
+        capture_output=True,
+        check=True,
+    )
+    return dict(changed=True, stdout=result.stdout)
+
+
+def absent(tuck: Path, package: str) -> dict:
+    if package not in installed(tuck):
+        return dict(changed=False)
+    result = subprocess.run(
+        [tuck, "remove", package],
+        capture_output=True,
+        check=True,
+    )
+    return dict(changed=True, stdout=result.stdout)
+
+
+def main():
+    module = AnsibleModule(
+        argument_spec=dict(
+            name=dict(type="str"),
+            state=dict(
+                type="str",
+                choices=[
+                    "absent",
+                    "latest",
+                    "present",
+                ],
+                default="present",
+            ),
+        ),
+        supports_check_mode=False,
+    )
+
+    tuck = Path(environ["HOME"]) / ".local" / "bin" / "tuck"
+    try:
+        if not (tuck.is_file() and os.access(tuck, os.X_OK)):
+            response = requests.get("https://kbenzie.github.io/tuck/get.sh")
+            response.raise_for_status()
+            subprocess.run(
+                ["/bin/sh"],
+                input=response.text.encode("utf-8"),
+                check=True,
+            )
+
+        module.exit_json(
+            **{
+                "absent": absent,
+                "present": present,
+                "latest": latest,
+            }[module.params["state"]](tuck, module.params["name"])
+        )
+
+    except requests.RequestException as error:
+        module.fail_json(f"failed to install tuck: {error}")
+    except subprocess.CalledProcessError as error:
+        module.fail_json(f"failed to install tuck: {error.stderr}")
+
+
+if __name__ == "__main__":
+    main()

library/win_git.ps1

@@ -93,7 +93,7 @@ function Get-GitRemoteHeadBranch {
     $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")
+                         $result.stderr)
     }
     return $result.stdout.Trim().Replace("$remote/", '')
 }
@@ -108,6 +108,16 @@ function Get-GitCurrentSha {
     return $result.stdout.Trim()
 }
 
+function Get-GitRemoteUrl {
+    [CmdletBinding()]
+    Param (
+        [Parameter(Mandatory = $true)] [String] $dest,
+        [Parameter(Mandatory = $true)] [String] $remote
+    )
+    $result = Run-Command -command "`"$git`" remote get-url $remote" -working_directory $dest
+    return $result.stdout.Trim()
+}
+
 function Invoke-GitClone {
     [CmdletBinding()]
     Param (
@@ -187,6 +197,19 @@ function Invoke-GitSubmoduleUpdate {
     }
 }
 
+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) {
@@ -207,6 +230,10 @@ if (($dest -and ![System.IO.File]::Exists($gitconfig))) {
     if (Test-GitLocalChanges $dest) {
         $module.FailJson('Local modifications exist in repository.')
     }
+    $url = Get-GitRemoteUrl $dest $remote
+    if ($url -ne $repo) {
+        Invoke-GitRemoteSetUrl $dest $remote $repo
+    }
     Invoke-GitFetch $dest $remote $version
     Invoke-GitCheckout $dest $remote $version
     Invoke-GitPull $dest $remote $version

library/win_git.py

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

@@ -0,0 +1,99 @@
+#!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

@@ -0,0 +1,47 @@
+# -*- 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/Linux.yaml

@@ -13,3 +13,5 @@
       when: "'GNOME' in ansible_env.XDG_CURRENT_DESKTOP"
     - role: xremap
       when: "'GNOME' in ansible_env.XDG_CURRENT_DESKTOP"
+    - role: fedora-workstation
+      when: ansible_os_family == 'RedHat' and ansible_distribution == 'Fedora'

playbooks/LinuxCLI.yaml

@@ -11,5 +11,7 @@
     - vars/environment.yaml
   roles:
     - role: gdb
+    - role: nvtop
     - role: podman
     - role: system-info
+      when: disable_systemd is not defined

playbooks/UnixCLI.yaml

@@ -30,6 +30,7 @@
     - role: ripgrep
     - role: tidy
     - role: tree
+    - role: typst
     - role: watch
     - role: wget
     - role: yq

playbooks/Windows.yaml

@@ -1,35 +1,17 @@
 ---
+- 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: fd
-    - role: fzf
-    - role: gh
-    - role: glab
-    - role: jq
-    - role: ripgrep
-    - role: tree
-    - role: yq
-
-    - role: llvm
-    - role: nodejs
-
     - role: 1password
     - role: autohotkey
-    - role: cider
+    - role: apple-music
     - role: ferdium
     - role: firefox
     - role: fonts
     - role: obsidian
     - role: powertoys
     - role: windows-terminal
+    - role: wezterm
+    - role: neovide

playbooks/WindowsCLI.yaml

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

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

@@ -15,8 +15,9 @@
     - role: hiddenbar
     - role: iterm
     - role: kitty
-    - role: magnet
+    - role: neovide
-    - role: microsoft-remote-desktop
+    - role: rectangle
+    - role: windows-app
     - role: viscosity
 
     - role: macos

roles/1password/tasks/Windows.yaml

@@ -6,26 +6,10 @@
     app_exe: '{{ansible_env.LOCALAPPDATA}}/1Password/app/8/1Password.exe'
     installer_exe: '{{ansible_env.TEMP}}/1PasswordSetup-latest.exe'
 
-- name: check if already installed
+- name: install chocolatey package
-  win_stat:
+  win_chocolatey:
-    path: '{{app_exe}}'
+    state: latest
-  register: app_stat
+    name: 1password
-
-- 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}}'
-  environment: '{{proxy_environment}}'
-
-- name: run installer
-  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:
@@ -34,51 +18,27 @@
     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: check if op already installed
+- name: create cli directory
-  win_stat:
+  win_file:
-    path: '{{cli_exe}}'
+    state: directory
-  register: cli_stat
+    path: '{{cli_dir}}'
 
-- name: get installed op version
+- name: remove old op executable
-  when: cli_stat.stat.exists == True
+  win_file:
-  win_command: '{{cli_exe}} --version'
+    state: absent
-  register: cli_version
+    path: '{{cli_dir}}\op.exe'
-  changed_when: false
 
-- when: cli_stat.stat.exists == True
+- name: remove old op install directory from user PATH
-  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}}'
-  environment: '{{proxy_environment}}'
-
-- 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}}'
@@ -86,7 +46,7 @@
 - name: get op powershell completion script
   win_command:
     argv:
-      - '{{ansible_env.LOCALAPPDATA}}/1Password/cli/op.exe'
+      - '{{ansible_env.LOCALAPPDATA}}\Scoop\shims\op.exe'
       - completion
       - powershell
   register: powershell_completion_script

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

@@ -1,4 +1,9 @@
 ---
+- 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'

roles/ag/tasks/Windows.yaml

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

roles/apple-music/tasks/main.yaml

@@ -0,0 +1,10 @@
+---
+- 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,7 +6,7 @@
 
 - name: clone config repo
   win_git:
-    repo: git@code.infektor.net:config/AutoHotKey.git
+    repo: git@git.infektor.net:config/AutoHotKey.git
     dest: '{{autohotkey_repo_dir}}'
     branch: main
 
@@ -31,3 +31,25 @@
     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/bat/tasks/Windows.yaml

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

roles/curl/tasks/Windows.yaml

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

roles/fd/tasks/main.yaml

@@ -19,8 +19,14 @@
     name: fd
     state: latest
 
-- name: install Chocolatey package
+- name: remove chocolatey package
   when: ansible_os_family == 'Windows'
   win_chocolatey:
     name: fd
-    state: latest
+    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

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

@@ -1,8 +1,4 @@
 ---
-- 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/fzf/tasks/Windows.yaml

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

roles/gemini-cli/tasks/main.yaml

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

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

roles/git/vars/main.yaml

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

roles/glab/tasks/Debian.yaml

@@ -31,8 +31,9 @@
     latest_version: '{{releases.json[0].tag_name}}'
     query: >
       [?contains(name, `glab`)] |
-      [?contains(name, `Linux`)] |
+      [?contains(name, `linux`)] |
-      [?contains(name, `{{ansible_machine}}.deb`)] | [0]
+      [?contains(name, `{{
+        {'x86_64': 'amd64', 'arm64': 'arm64'}[ansible_machine]}}.deb`)] | [0]
 - set_fact:
     asset: '{{latest.assets.links|json_query(query)}}'
 

roles/glab/tasks/Windows.yaml

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

roles/gnome-shell/tasks/main.yaml

@@ -33,6 +33,8 @@
     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
@@ -66,3 +68,6 @@
 
 - when: ansible_distribution == 'Ubuntu'
   include_tasks: Ubuntu.yaml
+
+# TODO: install gnome extensions
+# TODO: /org/gnome/shell/extensions/quake-terminal/terminal-shortcut = ['<Super>space']

roles/hammerspoon/tasks/main.yaml

@@ -0,0 +1,29 @@
+---
+- set_fact:
+    config_dir: '{{ansible_env.HOME}}/.hammerspoon'
+
+- name: create config directory
+  file:
+    state: directory
+    path: '{{config_dir}}'
+
+- name: install config file
+  template:
+    src: init.lua
+    dest: '{{config_dir}}/init.lua'
+
+- name: install homebrew package
+  homebrew:
+    state: latest
+    name: hammerspoon
+
+- name: create spoons directory
+  file:
+    state: directory
+    path: '{{config_dir}}/Spoons'
+
+- name: install SpoonInstall Spoon
+  unarchive:
+    src: https://github.com/Hammerspoon/Spoons/raw/master/Spoons/SpoonInstall.spoon.zip
+    dest: '{{config_dir}}/Spoons'
+    remote_src: yes

roles/hammerspoon/templates/init.lua

@@ -0,0 +1,20 @@
+require('hs.ipc')
+
+hs.loadSpoon("SpoonInstall")
+spoon.SpoonInstall:andUse("EmmyLua")
+
+hs.hotkey.bind({'alt', 'cmd'}, 'B', function()
+  hs.application.launchOrFocus('Firefox')
+end)
+
+hs.hotkey.bind({'alt', 'cmd'}, 'T', function()
+  hs.application.launchOrFocus('kitty')
+end)
+
+hs.hotkey.bind({'alt', 'cmd'}, 'F', function()
+  hs.application.launchOrFocus('Ferdium')
+end)
+
+pcall(function()
+  require('local')
+end)

roles/jq/tasks/Windows.yaml

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

roles/kitty/tasks/main.yaml

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

roles/macos/tasks/main.yaml

@@ -7,3 +7,5 @@
     domain: com.apple.desktopservices
     key: DSDontWriteNetworkStores
     value: 'true'
+
+# TODO: ^Space Keyboard Shortcut for switching Input Sources

roles/neovide/tasks/main.yaml

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

@@ -10,26 +10,12 @@
     state: absent
 
 - set_fact:
-    old_package_dir: '/usr/local/lib/nvim/nvim-linux64'
+    old_package_dirs:
+      - /usr/local/lib/nvim/nvim-linux-x86_64
+      - /usr/local/stow/nvim/nvim-linux64
 
-- name: check if old package directory exists
+- include_tasks: sudo-rmdir.yaml
-  stat:
+  with_items: '{{old_package_dirs}}'
-    path: '{{old_package_dir}}'
-  register: old_package
-
-- name: uninstall package from old directory
-  when: old_package.stat.exists
-  become: true
-  command:
-    cmd: 'stow --delete --target /usr/local .'
-    chdir: '{{old_package_dir}}'
-
-- name: remove old package directory
-  when: old_package.stat.exists
-  become: true
-  file:
-    state: absent
-    path: '{{old_package_dir}}'
 
 - name: install gnu stow for managing tar.gz package
   become: true
@@ -68,7 +54,7 @@
     install_required:
       '{{installed_version is not defined or
          installed_version != latest.json.tag_name}}'
-    asset_query: '[?contains(name, `nvim-linux64.tar.gz`)]'
+    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}}'
@@ -78,7 +64,7 @@
 - name: remove nuisance mimeinfo.cache file
   become: true
   file:
-    path: /usr/local/stow/nvim/nvim-linux64/share/applications/mimeinfo.cache
+    path: /usr/local/stow/nvim/nvim-linux-x86_64/share/applications/mimeinfo.cache
     state: absent
 
 - name: uninstall old package from /usr/local
@@ -86,13 +72,13 @@
   become: true
   command:
     cmd: 'stow --delete --target /usr/local .'
-    chdir: '{{package_dir}}/nvim-linux64'
+    chdir: '{{package_dir}}/nvim-linux-x86_64'
 
 - name: remove old package
   become: true
   when: uninstall_required
   file:
-    path: '{{package_dir}}/nvim-linux64'
+    path: '{{package_dir}}/nvim-linux-x86_64'
     state: absent
 
 - name: create package directory
@@ -128,6 +114,6 @@
   become: true
   command:
     cmd: 'stow --no-folding --target /usr/local .'
-    chdir: '{{package_dir}}/nvim-linux64'
+    chdir: '{{package_dir}}/nvim-linux-x86_64'
 
 - include_tasks: Unix.yaml

roles/neovim/tasks/Unix.yaml

@@ -4,7 +4,7 @@
 
 - name: clone config repo
   git:
-    repo: git@code.infektor.net:config/nvim.git
+    repo: git@git.infektor.net:config/nvim.git
     dest: '{{vim_config_dir}}'
     version: main
 

roles/neovim/tasks/Windows.yaml

@@ -1,52 +1,34 @@
 ---
+- name: install winget packages
+  win_winget:
+    name:
+      - neovim.neovim
+      - equalsraf.neovim-qt
+    state: latest
 
-- name: install chocolatey packages
+- name: remove chocolatey package
   win_chocolatey:
     name: neovim
-    state: latest
+    state: absent
 
 - set_fact:
     vim_config_dir: '{{ansible_env.LOCALAPPDATA}}\nvim'
 
 - name: clone config repo
   win_git:
-    repo: git@code.infektor.net:config/nvim.git
+    repo: git@git.infektor.net:config/nvim.git
     dest: '{{vim_config_dir}}'
     branch: main
 
-# - TODO: neovim install pip packages
+# TODO: Create neovim-qt start menu shortcut
-#   win_pip:
+# Need a reliable way to get the path to nvim-qt which doesn't reply on
-#     name: '{{neovim_pip_packages}}'
+# where.exe or similar as it won't work on first install due to environment
-#     state: latest
+# variable update. winget installs the equalsraf.neovim-qt package in
-
+# {{ansible_env.ProgramFiles}}\neovim-qt {{neovim_qt_version}}\bin\nvim.qt.exe
-- name: create nvim start menu shortcut
+# so if I can get the version out of winget that would be a start.
-  win_shortcut:
+# - name: create nvim start menu shortcut
-    src: '{{ansible_env.ChocolateyToolsLocation}}/neovim/nvim-win64/bin/nvim-qt.exe'
+#   win_shortcut:
-    dest: '{{ansible_env.ProgramData}}/Microsoft/Windows/Start Menu/Programs/nvim-qt.lnk'
+#     src: '{{neovim_qt_exe}}'
-    icon: '{{ansible_env.ChocolateyToolsLocation}}/neovim/nvim-win64/bin/nvim-qt.exe,0'
+#     dest: '{{ansible_env.ProgramData}}/Microsoft/Windows/Start Menu/Programs/nvim-qt.lnk'
-    directory: '{{ansible_env.USERPROFILE}}'
+#     icon: '{{neovim_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
-  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

roles/neovim/tasks/sudo-rmdir.yaml

@@ -0,0 +1,19 @@
+---
+- 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,7 +1,3 @@
 ---
 neovim_pip_packages:
-  - cmake-language-server
-  - cmakelint
   - compdb
-  - vim-vint
-  - yamllint

roles/nodejs/tasks/Debian.yaml

@@ -26,4 +26,4 @@
     state: link
     src: '~/.local/src/node/node-{{latest.json[0].version}}-linux-x64/bin/{{item}}'
     dest: '~/.local/bin/{{item}}'
-  with_items: [corepack, node, npm, npx]
+  with_items: [node, npm, npx]

roles/nvtop/tasks/install-appimage.yaml

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

@@ -0,0 +1,10 @@
+---
+- 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/powershell/tasks/main.yaml

@@ -5,7 +5,7 @@
 
 - name: clone config repos
   win_git:
-    repo: https://code.infektor.net/config/WindowsPowerShell.git
+    repo: git@git.infektor.net:config/WindowsPowerShell.git
     dest: '{{powershell_config_dir}}'
     branch: main
 
@@ -38,3 +38,14 @@
     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/rectangle/tasks/main.yaml

@@ -2,7 +2,7 @@
 - assert:
     that: ansible_os_family == 'Darwin'
 
-- name: install app store package
+- name: install homebrew package
-  mas:
+  homebrew_cask:
-    id: 441258766
+    name: rectangle
     state: latest

roles/ripgrep/tasks/main.yaml

@@ -19,8 +19,14 @@
     name: ripgrep
     state: latest
 
-- name: install Chocolatey package
+- name: remove chocolatey package
   when: ansible_os_family == 'Windows'
   win_chocolatey:
     name: ripgrep
-    state: latest
+    state: absent
+
+- name: install scoop package
+  when: ansible_os_family == 'Windows'
+  community.windows.win_scoop:
+    name: ripgrep
+    state: present

roles/scoop/tasks/main.yaml

@@ -0,0 +1,25 @@
+---
+- name: detect if scoop is installed
+  win_command: where.exe scoop
+  changed_when: false
+  failed_when: false
+  register: scoop_result
+
+- assert:
+    that: scoop_result.rc == 0
+    fail_msg: Scoop is not installed
+
+- name: add extras bucket
+  community.windows.win_scoop_bucket:
+    name: extras
+    state: present
+
+- name: install completions
+  community.windows.win_scoop:
+    name: scoop-completion
+    state: present
+
+- win_owner:
+    path: '{{ansible_env.LOCALAPPDATA}}/Scoop/buckets/extras'
+    user: '{{ansible_env.USERNAME}}'
+    recurse: true

roles/sunshine/tasks/Debian.yaml

@@ -27,7 +27,7 @@
 - name: fix systemd unit
   become: true
   copy:
-    path: /usr/lib/systemd/user/sunshine.service
+    dest: /usr/lib/systemd/user/sunshine.service
     content: |
       [Unit]
       Description=Sunshine is a self-hosted game stream host for Moonlight.

roles/system-info/tasks/Darwin.yaml

@@ -1,14 +1,34 @@
 ---
+- name: install gawk package
+  homebrew:
+    name: gawk
+    state: latest
+
+- name: install iSMC package
+  tuck:
+    name: dkorunic/iSMC
+    state: latest
+
 - name: get list of running launchd services
   command: launchctl list
   register: launchd_running_services
   changed_when: false
 
+- set_fact:
+    system_info_plist_dir: '{{ansible_env.HOME}}/Library/LaunchAgents'
+
+- name: create plist directory
+  file:
+    state: directory
+    path: '{{system_info_plist_dir}}'
+
 - name: determine if system-info is currently running
   set_fact:
     system_info_debug: true
-    system_info_plist_path: '{{ansible_env.HOME}}/Library/LaunchAgents/system-info.plist'
+    system_info_plist_path:
-    system_info_running: "{{'system-info' in launchd_running_services.stdout}}"
+      '{{system_info_plist_dir}}/system-info.plist'
+    system_info_running:
+      "{{'system-info' in launchd_running_services.stdout}}"
 
 - name: install system-info launchd plist
   template:

roles/tmux/tasks/main.yaml

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

roles/typst/tasks/Linux.yaml

@@ -0,0 +1,76 @@
+---
+- name: get latest github release
+  uri:
+    url: https://api.github.com/repos/typst/typst/releases/latest
+    headers: '{{github_auth_headers}}'
+  register: latest
+
+- set_fact:
+    asset_name: >-
+      {{
+        {
+          'amd64': 'typst-x86_64-unknown-linux-musl',
+          'x86_64': 'typst-x86_64-unknown-linux-musl',
+          'arm64': 'typst-aarch64-unknown-linux-musl',
+        }[ansible_architecture]
+      }}
+
+- set_fact:
+    asset_query: '[?contains(name, `{{asset_name}}.tar.xz`)] | [0]'
+    assets: '{{latest.json.assets}}'
+    asset_archive: '{{asset_name}}.tar.xz'
+    latest_version: '{{latest.json.tag_name}}'
+    exe: '{{ansible_env.HOME}}/.local/bin/typst'
+
+- name: check if already installed
+  stat:
+    path: '{{exe}}'
+  register: stat_exe
+
+- name: get installed version
+  when: stat_exe.stat.exists == True
+  command: '{{exe}} --version'
+  register: version_output
+  changed_when: false
+
+- when: stat_exe.stat.exists == True
+  set_fact:
+    installed_version:
+      'v{{version_output.stdout.strip() | regex_replace("^.*(\d+\.\d+\.\d+).*$", "\1")}}'
+
+- set_fact:
+    asset: '{{assets | to_json | from_json | json_query(asset_query)}}'
+
+- name: download archive
+  when: installed_version is not defined or installed_version != latest_version
+  get_url:
+    url: '{{asset.browser_download_url}}'
+    dest: '/tmp/{{asset_archive}}'
+  environment: '{{proxy_environment}}'
+
+- name: extract archive
+  when: installed_version is not defined or installed_version != latest_version
+  unarchive:
+    src: '/tmp/{{asset_archive}}'
+    dest: '/tmp'
+
+- name: remove archive
+  when: installed_version is not defined or installed_version != latest_version
+  file:
+    state: absent
+    path: '/tmp/{{asset_archive}}'
+
+- name: copy executable
+  when: installed_version is not defined or installed_version != latest_version
+  copy:
+    src: '/tmp/{{asset_name}}/typst'
+    dest: '{{exe}}'
+    mode: +x
+
+- name: remove extraced archive
+  when: installed_version is not defined or installed_version != latest_version
+  file:
+    state: absent
+    path: '/tmp/{{asset_archive}}'
+
+# TODO: install zsh completions

roles/typst/tasks/main.yaml

@@ -0,0 +1,15 @@
+---
+- name: install homebrew package
+  when: ansible_os_family == 'Darwin'
+  homebrew:
+    state: latest
+    name: typst
+
+- name: install scoop package
+  when: ansible_os_family == 'Windows'
+  community.windows.win_scoop:
+    state: present
+    name: typst
+
+- when: ansible_os_family != 'Darwin' and ansible_os_family != 'Windows'
+  include_tasks: Linux.yaml

roles/wezterm/tasks/Windows.yaml

@@ -0,0 +1,10 @@
+---
+- name: install chocolatey package
+  win_chocolatey:
+    name: wezterm
+    state: latest
+
+- name: clone config repo
+  win_git:
+    repo: git@git.infektor.net:config/wezterm.git
+    dest: '{{ansible_env.USERPROFILE}}/.config/wezterm'

roles/wezterm/tasks/main.yaml

@@ -0,0 +1,2 @@
+---
+- include_tasks: '{{ansible_os_family}}.yaml'

roles/windows-app/tasks/main.yaml

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

roles/windows-terminal/tasks/main.yaml

@@ -4,6 +4,7 @@
     src: '{{windows_terminal_settings_json}}'
   register: slurped_settings
 
+# TODO: Handle comments in settings.json
 - name: decode settings into fact
   set_fact:
     settings: '{{slurped_settings.content | b64decode | from_json}}'

roles/xremap/tasks/main.yaml

@@ -109,7 +109,7 @@
 
 - name: clone config repo
   git:
-    repo: git@code.infektor.net:config/xremap.git
+    repo: git@git.infektor.net:config/xremap.git
     dest: '{{config_dir}}'
     version: main
   notify: restart xremap

roles/yq/tasks/Windows.yaml

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

roles/zsh/tasks/main.yaml

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