From 6b6f8ac6de02e46ecfdd2bdd4608f54d5014d87c Mon Sep 17 00:00:00 2001
From: Fabio Scotto di Santolo <fscottodev@pm.me>
Date: Sat, 28 Mar 2026 18:48:25 +0100
Subject: [PATCH] Split desktop X11 packages from desktop profile packages

---
 ansible/inventory/group_vars/all.yml         |  18 +--
 ansible/inventory/group_vars/desktop.yml     | 116 ++++++++++---------
 ansible/inventory/group_vars/void.yml        |  34 +++---
 ansible/roles/packages_ubuntu/tasks/main.yml |   1 +
 ansible/roles/packages_void/tasks/main.yml   |   1 +
 5 files changed, 87 insertions(+), 83 deletions(-)

diff --git a/ansible/inventory/group_vars/all.yml b/ansible/inventory/group_vars/all.yml
index 12f052f..969aad3 100644
--- a/ansible/inventory/group_vars/all.yml
+++ b/ansible/inventory/group_vars/all.yml
@@ -18,17 +18,17 @@ xdg_user_directories:
 common_packages:
   - bash-completion
   - bat
-  - tmux
-  - git
-  - tree
-  - wget
-  - unzip
-  - zip
-  - vim
-  - fzf
-  - zoxide
   - entr
+  - fzf
+  - git
   - jq
+  - tmux
+  - tree
+  - unzip
+  - vim
+  - wget
+  - zip
+  - zoxide
 
 common_dotfiles:
   - name: .bashrc
diff --git a/ansible/inventory/group_vars/desktop.yml b/ansible/inventory/group_vars/desktop.yml
index 28596b4..13e2ef5 100644
--- a/ansible/inventory/group_vars/desktop.yml
+++ b/ansible/inventory/group_vars/desktop.yml
@@ -2,84 +2,86 @@
 desktop_manage_icloud_keyring: false
 desktop_protonmail_bridge_cert_path: ~/.var/app/ch.protonmail.protonmail-bridge/config/protonmail/bridge-v3/cert.pem
 
-profile_packages:
+desktop_x11_packages:
+  - arandr
+  - autorandr
+  - brightnessctl
+  - dex
+  - dunst
   - emptty
+  - feh
   - i3
   - i3blocks
   - i3blocks-blocklets
-  - i3status
   - i3lock-color
-  - dex
-  - dunst
+  - i3status
+  - network-manager-applet
   - rofi
-  - alacritty
-  - Thunar
-  - exo
-  - thunar-volman
+  - scrot
+  - setxkbmap
   - udiskie
+  - volumeicon
+  - xclip
   - xfce-polkit
   - xfce4-clipman-plugin
   - xfce4-screenshooter
-  - volumeicon
-  - brightnessctl
-  - autorandr
-  - arandr
-  - feh
-  - ImageMagick
-  - scrot
-  - xclip
   - xkbutils
-  - setxkbmap
   - xss-lock
-  - playerctl
-  - nerd-fonts-symbols-ttf
-  - network-manager-applet
+
+profile_packages:
+  - 7zip
+  - alacritty
+  - bluez
+  - blueman
+  - celluloid
   - chromium
-  - emacs-gtk3
-  - mu4e
-  - isync
-  - msmtp
-  - libsecret
-  - libtool
-  - libvterm-devel
-  - cmake
-  - gcc
-  - gdb
-  - pkg-config
-  - libX11-devel
-  - libXft-devel
-  - fontconfig-devel
-  - freetype-devel
-  - go
-  - nodejs
   - clang
   - clang-tools-extra
-  - mpv
-  - celluloid
-  - yt-dlp
-  - shotwell
-  - ristretto
-  - xournalpp
-  - pdfarranger
-  - remmina
+  - cmake
   - deluge-gtk
-  - xarchiver
-  - gufw
-  - ufw
-  - meld
-  - 7zip
-  - libreoffice
-  - lm_sensors
+  - emacs-gtk3
+  - exo
   - fastfetch
-  - liberation-fonts-ttf
-  - terminus-font
-  - blueman
-  - bluez
+  - fontconfig-devel
+  - freetype-devel
+  - gcc
+  - gdb
+  - go
+  - gufw
+  - ImageMagick
+  - isync
+  - libsecret
   - libspa-bluetooth
+  - libreoffice
+  - liberation-fonts-ttf
+  - libtool
+  - libvterm-devel
+  - libX11-devel
+  - libXft-devel
+  - lm_sensors
+  - meld
+  - mpv
+  - msmtp
+  - mu4e
+  - nerd-fonts-symbols-ttf
+  - nodejs
+  - pdfarranger
+  - pkg-config
+  - playerctl
+  - remmina
+  - ristretto
+  - rsync
+  - shotwell
+  - terminus-font
+  - Thunar
+  - thunar-volman
+  - ufw
   - wireplumber
+  - xarchiver
+  - xournalpp
   - yaru
   - yaru-plus
-  - rsync
+  - yt-dlp
 
 desktop_dotfiles:
   - name: XDG autostart entries
diff --git a/ansible/inventory/group_vars/void.yml b/ansible/inventory/group_vars/void.yml
index 340d4ec..1f3fda1 100644
--- a/ansible/inventory/group_vars/void.yml
+++ b/ansible/inventory/group_vars/void.yml
@@ -1,36 +1,36 @@
 ---
 void_packages_base:
+  - NetworkManager
   - base-system
-  - xtools
-  - vpm
-  - vsv
   - bat
   - delta
-  - xorg-minimal
-  - xorg-fonts
   - elogind
-  - NetworkManager
-  - network-manager-applet
-  - xdg-desktop-portal
-  - xdg-desktop-portal-gtk
   - flatpak
-  - gvfs
-  - pipewire
-  - pavucontrol
   - gnome-keyring
-  - seahorse
+  - gvfs
+  - network-manager-applet
+  - pavucontrol
+  - pipewire
   - podman
   - podman-compose
+  - seahorse
   - socklog
   - socklog-void
   - void-repo-nonfree
+  - vpm
+  - vsv
+  - xdg-desktop-portal
+  - xdg-desktop-portal-gtk
+  - xorg-fonts
+  - xorg-minimal
+  - xtools
 
 enabled_services:
+  - NetworkManager
+  - bluetoothd
   - dbus
   - elogind
   - emptty
-  - NetworkManager
-  - ufw
-  - bluetoothd
-  - socklog-unix
   - nanoklogd
+  - socklog-unix
+  - ufw
diff --git a/ansible/roles/packages_ubuntu/tasks/main.yml b/ansible/roles/packages_ubuntu/tasks/main.yml
index 55d1686..ac7ee2a 100644
--- a/ansible/roles/packages_ubuntu/tasks/main.yml
+++ b/ansible/roles/packages_ubuntu/tasks/main.yml
@@ -90,6 +90,7 @@
         + (ubuntu_packages_base | default([]))
         + (ubuntu_docker_packages | default([]))
         + (profile_packages | default([]))
+        + (desktop_x11_packages | default([]))
         + (host_packages | default([]))
       }}
     state: present
diff --git a/ansible/roles/packages_void/tasks/main.yml b/ansible/roles/packages_void/tasks/main.yml
index 22f1e78..854ff15 100644
--- a/ansible/roles/packages_void/tasks/main.yml
+++ b/ansible/roles/packages_void/tasks/main.yml
@@ -27,6 +27,7 @@
         (common_packages | default([]))
         + (void_packages_base | default([]))
         + (profile_packages | default([]))
+        + (desktop_x11_packages | default([]))
         + (host_packages | default([]))
       }}
     state: present