refactor: update inventory and configuration for desktop systems, replacing 'mennos-cachyos-desktop' with 'mennos-desktop'

config/ansible/tasks/global/symlinks.yml

@@ -33,8 +33,7 @@
         follow: false
       vars:
         gitconfig_mapping:
-          mennos-desktop: "$DOTFILES_PATH/config/git/gitconfig.wsl"
-          mennos-cachyos-desktop: "$DOTFILES_PATH/config/git/gitconfig.linux"
+          mennos-desktop: "$DOTFILES_PATH/config/git/gitconfig.linux"
           mennos-cachyos-laptop: "$DOTFILES_PATH/config/git/gitconfig.linux"
           mennos-laptop-w: "$DOTFILES_PATH/config/git/gitconfig.wsl"
           mennos-server: "$DOTFILES_PATH/config/git/gitconfig.mennos-server"

config/ansible/tasks/global/utils/smart-ssh/README.md

@@ -36,7 +36,7 @@ The utility is automatically compiled and installed to `~/.local/bin/ssh` via An
 3. Ensure your `~/.ssh/config` contains the referenced host entries:
    ```
    Host desktop
-       HostName mennos-cachyos-desktop
+       HostName mennos-desktop
        User menno
        Port 400
        ForwardAgent yes

config/ansible/tasks/global/utils/smart-ssh/config.yaml

@@ -76,7 +76,7 @@ tunnels:
 
 # Your SSH config should contain the actual host definitions:
 # Host desktop
-#     HostName mennos-cachyos-desktop
+#     HostName mennos-desktop
 #     User menno
 #     Port 400
 #     ForwardAgent yes

config/ansible/tasks/servers/dynamic-dns.yml

@@ -83,6 +83,6 @@
           - Manual run: sudo /usr/local/bin/dynamic-dns-update.sh
           - Domains: vleeuwen.me, mvl.sh, mennovanleeuwen.nl
 
-  when: inventory_hostname == 'mennos-cachyos-desktop'
+  when: inventory_hostname == 'mennos-desktop'
   tags:
     - dynamic-dns

config/ansible/tasks/servers/juicefs.yml

@@ -70,7 +70,7 @@
 
     - name: Include JuiceFS Redis tasks
       ansible.builtin.include_tasks: services/redis/redis.yml
-      when: inventory_hostname == 'mennos-cachyos-desktop'
+      when: inventory_hostname == 'mennos-desktop'
 
     - name: Enable and start JuiceFS service
       ansible.builtin.systemd:

config/ansible/tasks/servers/server.yml

@@ -13,12 +13,19 @@
         state: present
       when: ansible_pkg_mgr != 'pacman'
 
-    - name: Ensure server packages are installed
+    - name: Ensure Borg is installed on Arch-based systems
       ansible.builtin.package:
-        name:
-          - borg
+        name: borg
         state: present
       become: true
+      when: ansible_pkg_mgr == 'pacman'
+
+    - name: Ensure Borg is installed on Debian/Ubuntu systems
+      ansible.builtin.package:
+        name: borgbackup
+        state: present
+      become: true
+      when: ansible_pkg_mgr != 'pacman'
 
     - name: Include JuiceFS tasks
       ansible.builtin.include_tasks: juicefs.yml
@@ -71,80 +78,80 @@
       - name: qdrant
         enabled: true
         hosts:
-          - mennos-cachyos-desktop
+          - mennos-desktop
       - name: gitea
         enabled: true
         hosts:
-          - mennos-cachyos-desktop
+          - mennos-desktop
       - name: factorio
         enabled: true
         hosts:
-          - mennos-cachyos-desktop
+          - mennos-desktop
       - name: dozzle
         enabled: true
         hosts:
-          - mennos-cachyos-desktop
+          - mennos-desktop
       - name: beszel
         enabled: true
         hosts:
-          - mennos-cachyos-desktop
+          - mennos-desktop
       - name: caddy
         enabled: true
         hosts:
-          - mennos-cachyos-desktop
+          - mennos-desktop
       - name: golink
         enabled: true
         hosts:
-          - mennos-cachyos-desktop
+          - mennos-desktop
       - name: immich
         enabled: true
         hosts:
-          - mennos-cachyos-desktop
+          - mennos-desktop
       - name: plex
         enabled: true
         hosts:
-          - mennos-cachyos-desktop
+          - mennos-desktop
       - name: tautulli
         enabled: true
         hosts:
-          - mennos-cachyos-desktop
+          - mennos-desktop
       - name: stash
         enabled: true
         hosts:
-          - mennos-cachyos-desktop
+          - mennos-desktop
       - name: downloaders
         enabled: true
         hosts:
-          - mennos-cachyos-desktop
+          - mennos-desktop
       - name: wireguard
         enabled: true
         hosts:
-          - mennos-cachyos-desktop
+          - mennos-desktop
       - name: nextcloud
         enabled: true
         hosts:
-          - mennos-cachyos-desktop
+          - mennos-desktop
       - name: echoip
         enabled: true
         hosts:
-          - mennos-cachyos-desktop
+          - mennos-desktop
       - name: arr-stack
         enabled: true
         hosts:
-          - mennos-cachyos-desktop
+          - mennos-desktop
       - name: home-assistant
         enabled: true
         hosts:
-          - mennos-cachyos-desktop
+          - mennos-desktop
       - name: privatebin
         enabled: true
         hosts:
-          - mennos-cachyos-desktop
+          - mennos-desktop
       - name: unifi-network-application
         enabled: true
         hosts:
-          - mennos-cachyos-desktop
+          - mennos-desktop
       - name: avorion
         enabled: true
         hosts:
-          - mennos-cachyos-desktop
+          - mennos-desktop

config/ansible/tasks/servers/services/caddy/Caddyfile.j2

@@ -28,7 +28,7 @@
 }
 {% endif %}
 
-{% if inventory_hostname == 'mennos-cachyos-desktop' %}
+{% if inventory_hostname == 'mennos-desktop' %}
 git.mvl.sh {
    import country_block
    reverse_proxy gitea:3000

config/ansible/tasks/workstations/flatpaks.yml

@@ -50,6 +50,9 @@
       # Messaging
       - com.rtosta.zapzap
       - io.github.equicord.equibop
+      - org.telegram.desktop
+      - org.signal.Signal
+      - com.spotify.Client
 
       # Nextcloud Compatible Utilities
       - io.github.mrvladus.List