From d7629d33d6f6bf1de6fce171ed7bfc9d6059f5da Mon Sep 17 00:00:00 2001
From: Fabio Scotto di Santolo <fscottodev@pm.me>
Date: Wed, 13 May 2026 10:55:54 +0200
Subject: [PATCH] Expand and clean up Arch GNOME packages, remove alacritty
 from Arch

- arch_desktop_gnome_packages: add full GNOME app suite (baobab, gnome-console,
  loupe, papers, showtime, snapshot, sushi, gvfs backends, etc.), sort
  alphabetically, remove duplicates already in arch_packages_base
  (gnome-keyring, gvfs, gvfs-mtp, gvfs-smb, simple-scan)
- Remove alacritty from arch_profile_packages; move alacritty config and
  directory creation to Void-only (profile_desktop_i3 / desktop_void_dotfiles)
- Enable emacs user service via ansible.builtin.systemd (scope: user)
  instead of a manual symlink

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 ansible/inventory/group_vars/arch.yml         | 25 +++++++++++++++++--
 ansible/inventory/group_vars/desktop.yml      |  4 ---
 ansible/inventory/group_vars/void.yml         |  4 +++
 .../profile_desktop_common/tasks/main.yml     |  1 -
 .../profile_desktop_gnome/tasks/main.yml      | 16 ++++++------
 .../roles/profile_desktop_i3/tasks/main.yml   |  1 +
 6 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/ansible/inventory/group_vars/arch.yml b/ansible/inventory/group_vars/arch.yml
index e9aa5d1..ebf1408 100644
--- a/ansible/inventory/group_vars/arch.yml
+++ b/ansible/inventory/group_vars/arch.yml
@@ -69,19 +69,41 @@ arch_desktop_common_packages:
   - xdg-user-dirs
 
 arch_desktop_gnome_packages:
+  - baobab
   - gdm
+  - gnome-backgrounds
+  - gnome-calculator
+  - gnome-calendar
+  - gnome-characters
+  - gnome-clocks
+  - gnome-console
   - gnome-control-center
+  - gnome-disk-utility
+  - gnome-font-viewer
   - gnome-session
   - gnome-settings-daemon
   - gnome-shell
   - gnome-shell-extensions
   - gnome-tweaks
+  - gvfs-afc
+  - gvfs-dnssd
+  - gvfs-goa
+  - gvfs-gphoto2
+  - gvfs-nfs
+  - gvfs-onedrive
+  - gvfs-wsdd
+  - loupe
   - mutter
   - nautilus
+  - papers
+  - rygel
+  - showtime
+  - snapshot
+  - sushi
   - xdg-desktop-portal-gnome
+  - xdg-user-dirs-gtk
 
 arch_profile_packages:
-  - alacritty
   - deluge
   - dnsmasq
   - edk2-ovmf
@@ -102,7 +124,6 @@ arch_profile_packages:
   - noto-fonts
   - noto-fonts-emoji
   - pdfarranger
-  - playerctl
   - poppler
   - poppler-glib
   - qemu-desktop
diff --git a/ansible/inventory/group_vars/desktop.yml b/ansible/inventory/group_vars/desktop.yml
index c026502..a2a4d85 100644
--- a/ansible/inventory/group_vars/desktop.yml
+++ b/ansible/inventory/group_vars/desktop.yml
@@ -35,10 +35,6 @@ desktop_common_dotfiles:
     src: .config/autostart/
     dest: .config/autostart/
     mode: preserve
-  - name: alacritty config
-    src: .config/alacritty/
-    dest: .config/alacritty/
-    mode: preserve
   - name: fastfetch config
     src: .config/fastfetch/
     dest: .config/fastfetch/
diff --git a/ansible/inventory/group_vars/void.yml b/ansible/inventory/group_vars/void.yml
index f587a69..96af9e8 100644
--- a/ansible/inventory/group_vars/void.yml
+++ b/ansible/inventory/group_vars/void.yml
@@ -115,6 +115,10 @@ desktop_void_dotfiles:
     src: .bashrc.d/15-runit-desktop.sh
     dest: .bashrc.d/15-runit-desktop.sh
     mode: "0644"
+  - name: alacritty config
+    src: .config/alacritty/
+    dest: .config/alacritty/
+    mode: preserve
   - name: GTK theme setup script
     src: .local/bin/setup-gtk-theme
     dest: .local/bin/setup-gtk-theme
diff --git a/ansible/roles/profile_desktop_common/tasks/main.yml b/ansible/roles/profile_desktop_common/tasks/main.yml
index 0436367..1a84f18 100644
--- a/ansible/roles/profile_desktop_common/tasks/main.yml
+++ b/ansible/roles/profile_desktop_common/tasks/main.yml
@@ -19,7 +19,6 @@
   loop:
     - "{{ user_home }}/.config"
     - "{{ user_home }}/.config/autostart"
-    - "{{ user_home }}/.config/alacritty"
     - "{{ user_home }}/.config/systemd"
     - "{{ user_home }}/.config/systemd/user"
     - "{{ user_home }}/.bashrc.d"
diff --git a/ansible/roles/profile_desktop_gnome/tasks/main.yml b/ansible/roles/profile_desktop_gnome/tasks/main.yml
index 0c77425..9b40e2d 100644
--- a/ansible/roles/profile_desktop_gnome/tasks/main.yml
+++ b/ansible/roles/profile_desktop_gnome/tasks/main.yml
@@ -17,15 +17,13 @@
     owner: root
     group: root
 
-- name: Enable package-provided emacs user service
-  tags: [services, dotfiles:desktop, emacs]
-  ansible.builtin.file:
-    src: /usr/lib/systemd/user/emacs.service
-    dest: "{{ user_home }}/.config/systemd/user/default.target.wants/emacs.service"
-    state: link
-    owner: "{{ username }}"
-    group: "{{ user_group }}"
-    force: true
+- name: Enable emacs user service from package
+  tags: [services, emacs]
+  ansible.builtin.systemd:
+    name: emacs.service
+    enabled: true
+    scope: user
+  become_user: "{{ username }}"
 
 - name: Deploy gpg-agent.conf for GNOME (pinentry-gnome3, no ssh-support)
   tags: [dotfiles, dotfiles:desktop, gnome]
diff --git a/ansible/roles/profile_desktop_i3/tasks/main.yml b/ansible/roles/profile_desktop_i3/tasks/main.yml
index b7ef6ad..4e3c125 100644
--- a/ansible/roles/profile_desktop_i3/tasks/main.yml
+++ b/ansible/roles/profile_desktop_i3/tasks/main.yml
@@ -8,6 +8,7 @@
     group: "{{ user_group }}"
     mode: "0755"
   loop:
+    - "{{ user_home }}/.config/alacritty"
     - "{{ user_home }}/.config/dunst"
     - "{{ user_home }}/.config/i3"
     - "{{ user_home }}/.config/i3blocks"