diff --git a/AGENTS.md b/AGENTS.md index 5afb54d..69fc9e6 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -54,15 +54,24 @@ Ansible-driven personal infrastructure repo for Void desktops, Linux workstation - Use `no_log: true` for secret-bearing task inputs or outputs. ## Desktop Notes -- `profile_desktop_common` owns the shared desktop bootstrap. +- `profile_desktop_common` owns the shared desktop bootstrap; `profile_desktop_i3` (X11) and `profile_desktop_sway` (Wayland/SwayFX) install their respective session in parallel and are both wired into the `void` play in `ansible/site.yml`. `desktop_sessions_enabled` and `desktop_default_session` in host vars decide which sessions are exposed in `emptty` and which is preselected. - `.emacs.d` is deployed by a dedicated `profile_desktop_common` task tagged `emacs`. - NTFS filesystem support is provided by `ntfs-3g` in `ansible/inventory/group_vars/void.yml`. - Void user services are managed by `turnstile` and live under `dotfiles/desktop/.config/service/`. - `ssh-agent` keeps the stable socket `~/.local/state/ssh-agent/socket`. - Critical session entrypoints: - - `dotfiles/desktop/.xinitrc` + - `dotfiles/desktop/.xinitrc` (i3 / X11) + - `dotfiles/desktop/.config/sway/config` plus `host.conf` and `session-env` deployed via `host_sway_dotfiles` (sway / Wayland) - Do not auto-restart `emptty` during playbook runs on active Void desktop hosts; restart it manually from another TTY/SSH session if needed. -- `nymph` is an i3/X11 Void laptop with NVIDIA Optimus; host-specific tasks in `profile_desktop_host/tasks/nymph.yml` handle GRUB NVIDIA cmdline params, `prime-run` wrapper, and the WirePlumber camera priority config. +- `nymph` is a Void laptop with NVIDIA Optimus, running both i3 (X11) and sway (Wayland); host-specific tasks in `profile_desktop_host/tasks/nymph.yml` handle GRUB NVIDIA cmdline params, `prime-run` wrapper, and the WirePlumber camera priority config. Multi-monitor on X11 is driven by `autorandr`; on sway it is driven by `kanshi` (config deployed via `host_sway_dotfiles`). + +## Void Package And Dotfile Bucket Rules +The four Void desktop package lists in `ansible/inventory/group_vars/void.yml` are kept disjoint by role: +- `void_packages_base` — system runtime only (init/services, kernel, audio core, networking, filesystem, firewall, hardware daemons, runit logging). +- `desktop_common_packages` — WM-agnostic GUI infra (GTK theme, polkit, keyring, NM-applet, blueman, audio GUI, file manager backend + GVFS, portal, flatpak, printing/scanning). +- `desktop_i3_packages` / `desktop_sway_packages` — binaries specific to each session. Cross-WM packages used by both (`dunst`, `rofi`, `alacritty`) are intentionally duplicated in the two lists. +`profile_packages` in the same file is cross-distro and is overridden by `group_vars/server.yml` and the workstation group vars; do not move desktop-specific Void entries through it. +The dotfile vars follow the same split: `desktop_common_dotfiles` (in `group_vars/desktop.yml`) carries WM-agnostic GUI config and user scripts (Thunar, mimeapps, GTK theme setup, Udiskie, fontconfig, WirePlumber, mpv, …); `desktop_void_dotfiles` (in `group_vars/void.yml`) is reserved for files that need Void runtime (turnstile services, bash runit/dbus/ssh-agent fragments, `update-turnstile-env`). ## Workstation / Windows Notes - Native Linux workstation hosts can combine `workstation_host_linux` with an OS-specific dev group. diff --git a/README.md b/README.md index c39a750..8ac7cd4 100644 --- a/README.md +++ b/README.md @@ -72,22 +72,25 @@ Sistema operativo: Sessioni desktop: -- `ikaros`: i3 -- `nymph`: i3 +- `ikaros`: i3 (X11) + sway (Wayland), default i3 +- `nymph`: i3 (X11) + sway (Wayland), default i3 Macchine: - `ikaros` - `nymph` -Queste macchine condividono la stessa configurazione base desktop e vengono mantenute allineate tramite Ansible. +Queste macchine condividono la stessa configurazione base desktop e vengono mantenute allineate tramite Ansible. Sia i3 sia sway/SwayFX sono installate in parallelo e selezionabili da `emptty`; `desktop_default_session` decide quale sessione viene preselezionata al login. Lo stato attuale del profilo desktop include, tra le altre cose: - dotfiles comuni e desktop -- sessione i3 su entrambi gli host -- `emptty` con default host-specific per il desktop attivo, con `XORG_SESSIONS_PATH` puntato a `/etc/emptty/xsessions` per esporre solo le sessioni esplicitamente whitelistate -- pacchetti Void Linux e servizi runit +- sessioni i3 e sway su entrambi gli host (default i3, sway disponibile via `emptty`) +- `emptty` con default host-specific per il desktop attivo, con `XORG_SESSIONS_PATH` puntato a `/etc/emptty/xsessions` e session file Wayland esposti su `WAYLAND_SESSIONS_PATH` per `sway` +- pacchetti Void Linux e servizi runit; le liste pacchetti Void desktop sono separate per criterio: + - `void_packages_base` per il runtime sistema (init, kernel, audio core, networking, firewall, hw daemons) + - `desktop_common_packages` per l'infrastruttura GUI WM-agnostic (tema, polkit, keyring, NM-applet, blueman, audio GUI, file manager backend, portal, flatpak, printing/scanning) + - `desktop_i3_packages` e `desktop_sway_packages` per i binari specifici di ciascuna sessione - `turnstile` per i servizi utente, inclusi `emacs` e `ssh-agent` - `ssh-agent` con socket stabile condiviso tra shell, SSH ed Emacs in `~/.local/state/ssh-agent/socket` - `.emacs.d` distribuito da un task dedicato Ansible con tag `emacs` @@ -95,7 +98,7 @@ Lo stato attuale del profilo desktop include, tra le altre cose: - Flatpak con remoto Flathub - GNOME Keyring e bootstrap della posta via script dedicato - `udiskie` come backend per automount/LUKS -- `autorandr` per profili monitor host-specifici (`nymph` ha profili `dual` e `solo`) +- `autorandr` per profili monitor X11 host-specifici (`nymph` ha profili `dual` e `solo`); sotto sway il multi-monitor è gestito da `kanshi` (config host-specifica in `host_sway_dotfiles` su `nymph`) - override NVIDIA Optimus su `nymph`: parametri kernel GRUB iniettati in modo idempotente in `GRUB_CMDLINE_LINUX`, wrapper `prime-run` e config WirePlumber per priorità telecamera --- @@ -271,7 +274,8 @@ I principali ruoli attualmente presenti sono: | services_runit | gestione servizi runit | | services_systemd | gestione servizi systemd | | profile_desktop_common | bootstrap desktop Void condiviso | -| profile_desktop_i3 | sessione desktop i3 | +| profile_desktop_i3 | sessione desktop i3 (X11) | +| profile_desktop_sway | sessione desktop sway / SwayFX (Wayland) | | profile_desktop_host | override desktop specifici per host | | profile_workstation_dev_common | configurazione dev workstation condivisa | | profile_workstation_gnome | configurazione host workstation GNOME | @@ -289,7 +293,7 @@ Il playbook `ansible/site.yml` e attualmente composto da sette blocchi: ```text all:!workstation_host_windows -> dotfiles_common -void -> packages_void + services_runit + profile_desktop_common + profile_desktop_i3 + profile_desktop_host +void -> packages_void + services_runit + profile_desktop_common + profile_desktop_i3 + profile_desktop_sway + profile_desktop_host workstation_dev_ubuntu -> packages_ubuntu + services_systemd + profile_workstation_dev_common workstation_dev_fedora -> packages_fedora + services_systemd + profile_workstation_dev_common workstation_host_linux -> profile_workstation_gnome @@ -439,7 +443,8 @@ Allo stato attuale `ansible/site.yml` espone questi tag: | `dotfiles:workstation` | dotfiles dedicati alle workstation | workstation Linux, WSL | | `emptty` | gestione display manager `emptty` | desktop Void | | `gnome` | configurazione host GNOME | workstation host Linux, parte desktop | -| `i3` | sessione/configurazione i3 | desktop Void | +| `i3` | sessione/configurazione i3 (X11) | desktop Void | +| `sway` | sessione/configurazione sway / SwayFX (Wayland) | desktop Void | | `npm` | installazione pacchetti npm globali | desktop Void, workstation Linux, WSL | | `nvidia` | componenti NVIDIA desktop | desktop Void | | `packages` | installazione e aggiornamento pacchetti | tutti i profili | @@ -451,6 +456,7 @@ Esempi pratici: ```bash ansible-playbook ansible/site.yml --limit nymph --tags dotfiles:desktop,i3 --check --diff +ansible-playbook ansible/site.yml --limit ikaros --tags sway,portal --check --diff ansible-playbook ansible/site.yml --limit deadalus-fedora --tags packages,vscode --check --diff ansible-playbook ansible/site.yml --limit prometheus --tags services,dotfiles:server --check --diff ```