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

config/ansible/inventory.ini

@@ -2,9 +2,8 @@
 mennos-laptop-w ansible_connection=local
 mennos-cachyos-laptop ansible_connection=local
 mennos-desktop ansible_connection=local
-mennos-cachyos-desktop ansible_connection=local
 
 [servers]
 mennos-server ansible_connection=local
 mennos-vm ansible_connection=local
-mennos-cachyos-desktop ansible_connection=local
+mennos-desktop ansible_connection=local

config/ansible/playbook.yml

@@ -12,8 +12,8 @@
 
     - name: Include workstation tasks
       ansible.builtin.import_tasks: tasks/workstations/workstation.yml
-      when: inventory_hostname in ['mennos-laptop-w', 'mennos-cachyos-laptop', 'mennos-desktop', 'mennos-cachyos-desktop']
+      when: inventory_hostname in ['mennos-laptop-w', 'mennos-cachyos-laptop', 'mennos-desktop']
 
     - name: Include server tasks
       ansible.builtin.import_tasks: tasks/servers/server.yml
-      when: inventory_hostname in ['mennos-server', 'mennos-hobbypc', 'mennos-vm', 'mennos-cachyos-desktop']
+      when: inventory_hostname in ['mennos-server', 'mennos-hobbypc', 'mennos-vm', '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-desktop: "$DOTFILES_PATH/config/git/gitconfig.linux"
-          mennos-cachyos-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:
+        name: borg
-          - 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

config/ansible/templates/juicefs.service.j2

@@ -5,7 +5,7 @@ Before=docker.service
 
 [Service]
 Type=simple
-ExecStart=/usr/local/bin/juicefs mount redis://:{{ redis_password }}@mennos-cachyos-desktop:6379/0 /mnt/object_storage \
+ExecStart=/usr/local/bin/juicefs mount redis://:{{ redis_password }}@mennos-desktop:6379/0 /mnt/object_storage \
   --cache-dir=/var/jfsCache \
   --buffer-size=4096 \
   --prefetch=16 \

config/autostart/com.rtosta.zapzap.desktop

@@ -1,6 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=com.rtosta.zapzap
-X-XDP-Autostart=com.rtosta.zapzap
-Exec=flatpak run --command=zapzap com.rtosta.zapzap --hideStart
-X-Flatpak=com.rtosta.zapzap

config/home-manager/flake.lock

@@ -25,11 +25,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1755776884,
+        "lastModified": 1755928099,
-        "narHash": "sha256-CPM7zm6csUx7vSfKvzMDIjepEJv1u/usmaT7zydzbuI=",
+        "narHash": "sha256-OILVkfhRCm8u18IZ2DKR8gz8CVZM2ZcJmQBXmjFLIfk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "4fb695d10890e9fc6a19deadf85ff79ffb78da86",
+        "rev": "4a44fb9f7555da362af9d499817084f4288a957f",
         "type": "github"
       },
       "original": {

config/home-manager/flake.nix

@@ -33,7 +33,7 @@
     in
     {
       homeConfigurations = {
-        "mennos-cachyos-desktop" = home-manager.lib.homeManagerConfiguration {
+        "mennos-desktop" = home-manager.lib.homeManagerConfiguration {
           inherit pkgs;
           modules = [ ./home.nix ];
           extraSpecialArgs = {
@@ -43,7 +43,7 @@
               opnix
               ;
             isServer = false;
-            hostname = "mennos-cachyos-desktop";
+            hostname = "mennos-desktop";
           };
         };
 
@@ -61,20 +61,6 @@
           };
         };
 
-        "mennos-desktop" = home-manager.lib.homeManagerConfiguration {
-          inherit pkgs;
-          modules = [ ./home.nix ];
-          extraSpecialArgs = {
-            inherit
-              pkgs
-              pkgs-unstable
-              opnix
-              ;
-            isServer = false;
-            hostname = "mennos-desktop";
-          };
-        };
-
         "mennos-server" = home-manager.lib.homeManagerConfiguration {
           inherit pkgs;
           modules = [ ./home.nix ];

config/home-manager/packages/common/packages.nix

@@ -9,8 +9,6 @@
   imports =
     if hostname == "mennos-desktop" then
       [ ./hosts/mennos-desktop.nix ]
-    else if hostname == "mennos-cachyos-desktop" then
-      [ ./hosts/mennos-cachyos-desktop.nix ]
     else if hostname == "mennos-laptop-w" then
       [ ./hosts/mennos-laptop-w.nix ]
     else if hostname == "mennos-cachyos-laptop" then

config/nextcloud.cfg

@@ -1,5 +1,5 @@
 [General]
-clientVersion=3.17.1daily
+clientVersion=3.16.0-1 (Debian built)
 confirmExternalStorage=true
 crashReporter=true
 desktopEnterpriseChannel=daily
@@ -71,7 +71,7 @@ useNewBigFolderSizeLimit=true
 0\Folders\7\virtualFilesMode=off
 0\authType=webflow
 0\dav_user=menno
-0\displayName=Menno van Leeuwe
+0\displayName=Menno van Leeuwen
 0\encryptionCertificateSha256Fingerprint=@ByteArray()
 0\networkDownloadLimit=0
 0\networkDownloadLimitSetting=-2
@@ -83,10 +83,10 @@ useNewBigFolderSizeLimit=true
 0\networkProxyUser=
 0\networkUploadLimit=0
 0\networkUploadLimitSetting=-2
-0\serverColor=@Variant(\0\0\0\x43\x1\xff\xff\0\0gg\x9e\x9e\0\0)
+0\serverColor=@Variant(\0\0\0\x43\x1\xff\xff\x1c\x1c$$<<\0\0)
 0\serverHasValidSubscription=false
 0\serverTextColor=@Variant(\0\0\0\x43\x1\xff\xff\xff\xff\xff\xff\xff\xff\0\0)
-0\serverVersion=31.0.7.1
+0\serverVersion=31.0.8.1
 0\url=https://drive.mvl.sh
 0\version=13
 0\webflow_user=menno
@@ -99,4 +99,4 @@ useDownloadLimit=0
 useUploadLimit=0
 
 [Settings]
-geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\x4\xe0\0\0\x2\x37\0\0\aj\0\0\0\0\0\0\x4\xe0\0\0\x2\x37\0\0\aj\0\0\0\x1\0\0\0\0\x14\0\0\0\0\0\0\0\x4\xe0\0\0\x2\x37\0\0\aj)
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\x4\xe\0\0\x2\xa4\0\0\x6\x98\0\0\0\0\0\0\x4\xe\0\0\x2\xa4\0\0\x6\x98\0\0\0\x1\0\0\0\0\x14\0\0\0\0\0\0\0\x4\xe\0\0\x2\xa4\0\0\x6\x98)

config/ssh/config

@@ -3,3 +3,6 @@ Host *
   ForwardAgent yes
 
 Include ~/.ssh/config.d/*.conf
+
+Host *
+  IdentityAgent ~/.1password/agent.sock

vscode/settings.json

@@ -6,7 +6,6 @@
     "*": true
   },
   "git.autofetch": true,
-  "workbench.iconTheme": "vscode-icons",
   "[jsonc]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
@@ -53,7 +52,6 @@
   "remote.SSH.remotePlatform": {
     "mennos-laptop-w": "linux",
     "mennos-desktop": "linux",
-    "mennos-cachyos-desktop": "linux",
     "cloud": "linux"
   },
   "editor.tabSize": 2,
@@ -74,7 +72,7 @@
   "window.confirmSaveUntitledWorkspace": false,
   "git.openRepositoryInParentFolders": "never",
   "debug.toolBarLocation": "commandCenter",
-  "workbench.colorTheme": "Default Dark+",
+  "workbench.colorTheme": "One Dark Pro Darker",
   "ansible.lightspeed.enabled": false,
   "ansible.lightspeed.suggestions.enabled": false,
   "docker.extension.enableComposeLanguageServer": false,
@@ -96,5 +94,7 @@
     "git diff",
     "git show"
   ],
-  "kilo-code.deniedCommands": []
+  "kilo-code.deniedCommands": [],
+  "github.copilot.nextEditSuggestions.enabled": true,
+  "workbench.iconTheme": "material-icon-theme"
 }