Reorganize desktop roles: extract common bootstrap and host-specific layers

- Add profile_desktop_common with shared desktop bootstrap (emptty, PAM,
  dotfiles, templates, GPG, Maildir, Flatpak, st, external tools)
- Add profile_desktop_host with host-specific tasks (NVIDIA/PRIME on nymph)
- Reduce profile_desktop_i3 to i3/X11-only tasks
- Create profile_desktop_hyprland for Hyprland Wayland session
- Add dual-session support (i3 + Hyprland) on nymph with session choice
- Create shared Hyprland/Waybar dotfiles under dotfiles/desktop/
- Fix Waybar: bottom position, no persistent workspaces, sort by number
- Rename host_dotfiles to host_i3_dotfiles for clarity
- Make emptty restart manual by default to avoid session drops
This commit is contained in:
Fabio Scotto di Santolo
2026-03-30 12:43:41 +02:00
parent 56d634c64e
commit 0a80706ea2
34 changed files with 1342 additions and 1013 deletions

View File

@@ -2,36 +2,57 @@
desktop_manage_icloud_keyring: false
desktop_protonmail_bridge_cert_path: ~/.var/app/ch.protonmail.protonmail-bridge/config/protonmail/bridge-v3/cert.pem
desktop_x11_packages:
- arandr
- autorandr
desktop_sessions_enabled:
- i3
desktop_default_session: i3
desktop_default_session_env: xorg
desktop_restart_emptty_automatically: false
desktop_emptty_session_error_logging: disabled
desktop_common_packages:
- brightnessctl
- dex
- dunst
- emptty
- network-manager-applet
- rofi
- udiskie
- xfce-polkit
- xdg-desktop-portal
- xdg-desktop-portal-gtk
desktop_i3_packages:
- arandr
- autorandr
- feh
- i3
- i3blocks
- i3blocks-blocklets
- i3lock-color
- i3status
- network-manager-applet
- rofi
- scrot
- setxkbmap
- udiskie
- volumeicon
- xclip
- xfce-polkit
- xfce4-clipman-plugin
- xfce4-screenshooter
- xkbutils
- xdg-desktop-portal
- xdg-desktop-portal-gtk
- xorg-fonts
- xorg-minimal
- xss-lock
desktop_hyprland_packages:
- grim
- hypridle
- hyprland
- hyprlock
- hyprpaper
- slurp
- Waybar
- wl-clipboard
- xdg-desktop-portal-hyprland
profile_packages:
- alacritty
- bluez
@@ -68,19 +89,11 @@ profile_packages:
- yaru
- yaru-plus
desktop_dotfiles:
desktop_common_dotfiles:
- name: XDG autostart entries
src: .config/autostart/
dest: .config/autostart/
mode: preserve
- name: i3 config
src: .config/i3/
dest: .config/i3/
mode: preserve
- name: i3blocks config
src: .config/i3blocks/
dest: .config/i3blocks/
mode: preserve
- name: dunst config
src: .config/dunst/
dest: .config/dunst/
@@ -113,10 +126,6 @@ desktop_dotfiles:
src: .config/yt-dlp/
dest: .config/yt-dlp/
mode: preserve
- name: .xinitrc
src: .xinitrc
dest: .xinitrc
mode: "0644"
- name: .gitignore_global
src: .gitignore_global
dest: .gitignore_global
@@ -129,6 +138,50 @@ desktop_dotfiles:
src: .emacs.d/
dest: .emacs.d/
mode: preserve
- name: GTK theme setup script
src: .local/bin/setup-gtk-theme
dest: .local/bin/setup-gtk-theme
mode: "0755"
- name: Lock session script
src: .local/bin/lock-session
dest: .local/bin/lock-session
mode: "0755"
- name: Powermenu script
src: .local/bin/powermenu
dest: .local/bin/powermenu
mode: "0755"
desktop_i3_dotfiles:
- name: i3 config
src: .config/i3/
dest: .config/i3/
mode: preserve
- name: i3blocks config
src: .config/i3blocks/
dest: .config/i3blocks/
mode: preserve
- name: .xinitrc
src: .xinitrc
dest: .xinitrc
mode: "0644"
desktop_hyprland_dotfiles:
- name: Hyprland config
src: .config/hypr/
dest: .config/hypr/
mode: preserve
- name: Waybar config
src: .config/waybar/
dest: .config/waybar/
mode: preserve
- name: Hyprland session wrapper
src: .local/bin/start-hyprland-session
dest: .local/bin/start-hyprland-session
mode: "0755"
- name: Wayland screenshot script
src: .local/bin/screenshot-wayland
dest: .local/bin/screenshot-wayland
mode: "0755"
desktop_flatpak_packages:
- be.alexandervanhee.gradia

View File

@@ -1,6 +1,12 @@
---
hostname: ikaros
desktop_sessions_enabled:
- i3
desktop_default_session: i3
desktop_default_session_env: xorg
host_packages:
- mesa-dri
- vulkan-loader
@@ -8,7 +14,7 @@ host_packages:
- mesa-vaapi
- xf86-video-amdgpu
host_dotfiles:
host_i3_dotfiles:
- src: .config/autorandr/
dest: .config/autorandr/
mode: preserve

View File

@@ -1,13 +1,17 @@
---
hostname: nymph
desktop_sessions_enabled:
- i3
- hyprland
desktop_prompt_for_session: true
desktop_emptty_session_error_logging: rotate
host_xbps_repositories:
- name: hyprland-void
url: "https://raw.githubusercontent.com/Makrennel/hyprland-void/repository-x86_64-glibc"
host_emptty_wayland_sessions:
- Hyprland.desktop
host_packages:
- nvidia
- mesa-dri
@@ -16,22 +20,16 @@ host_packages:
- intel-video-accel
- tlp
- tlp-rdw
- hyprland
- hyprpaper
- xdg-desktop-portal-hyprland
- Waybar
- wlogout
host_enabled_services:
- tlp
host_dotfiles:
host_i3_dotfiles:
- src: .config/autorandr/
dest: .config/autorandr/
mode: preserve
- src: .config/hypr/
dest: .config/hypr/
mode: preserve
- src: .config/waybar/
dest: .config/waybar/
mode: preserve
host_hyprland_dotfiles:
- src: .config/hypr/host.conf
dest: .config/hypr/host.conf
mode: "0644"