From b0e843bbd2a4137404e676aa7f1d0e7ffa76de75 Mon Sep 17 00:00:00 2001
From: Fabio Scotto di Santolo <fscottodev@pm.me>
Date: Wed, 13 May 2026 10:41:10 +0200
Subject: [PATCH] Switch to emacs-wayland on Arch, use package-provided
 emacs.service
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- emacs → emacs-wayland in arch_profile_packages
- Remove custom emacs.service deployment: replace full .config/systemd/user/
  directory copy with individual service files (rclone-pcloud, syncthing)
- Remove emacs.service from desktop_systemd_user_services
- Enable package-provided /usr/lib/systemd/user/emacs.service via symlink
  in profile_desktop_gnome

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 ansible/inventory/group_vars/arch.yml              |  3 +--
 ansible/inventory/group_vars/desktop.yml           | 12 ++++++++----
 ansible/roles/profile_desktop_gnome/tasks/main.yml | 10 ++++++++++
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/ansible/inventory/group_vars/arch.yml b/ansible/inventory/group_vars/arch.yml
index 6398534..dd05e69 100644
--- a/ansible/inventory/group_vars/arch.yml
+++ b/ansible/inventory/group_vars/arch.yml
@@ -85,7 +85,7 @@ arch_profile_packages:
   - deluge
   - dnsmasq
   - edk2-ovmf
-  - emacs
+  - emacs-wayland
   - ffmpegthumbnailer
   - firefox
   - fontconfig
@@ -134,6 +134,5 @@ enabled_services:
   - ufw
 
 desktop_systemd_user_services:
-  - emacs.service
   - syncthing.service
   - rclone-pcloud.service
diff --git a/ansible/inventory/group_vars/desktop.yml b/ansible/inventory/group_vars/desktop.yml
index ea472c1..c026502 100644
--- a/ansible/inventory/group_vars/desktop.yml
+++ b/ansible/inventory/group_vars/desktop.yml
@@ -117,10 +117,14 @@ desktop_common_dotfiles:
     mode: "0600"
 
 desktop_arch_dotfiles:
-  - name: systemd user services
-    src: .config/systemd/user/
-    dest: .config/systemd/user/
-    mode: preserve
+  - name: rclone pcloud systemd user service
+    src: .config/systemd/user/rclone-pcloud.service
+    dest: .config/systemd/user/rclone-pcloud.service
+    mode: "0644"
+  - name: syncthing systemd user service
+    src: .config/systemd/user/syncthing.service
+    dest: .config/systemd/user/syncthing.service
+    mode: "0644"
   - name: MIME application defaults
     src: .config/mimeapps.arch.list
     dest: .config/mimeapps.list
diff --git a/ansible/roles/profile_desktop_gnome/tasks/main.yml b/ansible/roles/profile_desktop_gnome/tasks/main.yml
index 2475673..0c77425 100644
--- a/ansible/roles/profile_desktop_gnome/tasks/main.yml
+++ b/ansible/roles/profile_desktop_gnome/tasks/main.yml
@@ -17,6 +17,16 @@
     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: Deploy gpg-agent.conf for GNOME (pinentry-gnome3, no ssh-support)
   tags: [dotfiles, dotfiles:desktop, gnome]
   ansible.builtin.copy: