fscotto/infra
1
0
Fork 0
mirror of https://github.com/fscotto/infra.git synced 2026-05-30 15:39:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable new Archlinux profile for nymph

Browse Source
This commit is contained in:
Fabio Scotto di Santolo
2026-05-12 18:02:30 +02:00
parent e4d6deb3c5
commit f0fcc92d6d
20 changed files with 520 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

142
ansible/inventory/group_vars/arch.yml Normal file
View File

@@ -0,0 +1,142 @@
---
arch_packages_base:
- 7zip
- archlinux-keyring
- avahi
- base-devel
- bluez
- clang
- cmake
- cups
- cups-filters
- cups-pk-helper
- fastfetch
- flatpak
- fuse3
- gcc
- gdb
- git-delta
- github-cli
- gnome-keyring
- go
- gvfs
- gvfs-mtp
- gvfs-smb
- imagemagick
- isync
- libsecret
- libtool
- linux
- linux-headers
- lm_sensors
- man-db
- man-pages
- msmtp
- mu
- networkmanager
- nodejs
- npm
- pavucontrol
- pipewire
- pipewire-alsa
- pipewire-jack
- pipewire-pulse
- pkgconf
- plocate
- podman
- podman-compose
- rclone
- sane
- sane-airscan
- seahorse
- simple-scan
- speech-dispatcher
- syncthing
- system-config-printer
- tealdeer
- tmux
- tree-sitter-cli
- ufw
- wireplumber
- xdotool
- yt-dlp
arch_desktop_common_packages:
- brightnessctl
- dex
- pinentry
- udiskie
- xdg-desktop-portal
- xdg-desktop-portal-gtk
- xdg-user-dirs
arch_desktop_gnome_packages:
- gdm
- gnome-control-center
- gnome-session
- gnome-settings-daemon
- gnome-shell
- gnome-shell-extensions
- gnome-tweaks
- mutter
- nautilus
- xdg-desktop-portal-gnome
arch_profile_packages:
- alacritty
- bridge-utils
- deluge
- dnsmasq
- edk2-ovmf
- emacs
- ffmpegthumbnailer
- firefox
- fontconfig
- freetype2
- gufw
- libvterm
- libx11
- libxft
- libvirt
- libreoffice-fresh
- meld
- mpv
- noto-fonts
- noto-fonts-emoji
- pdfarranger
- playerctl
- poppler
- poppler-glib
- qemu-desktop
- remmina
- ripgrep
- rsync
- ruff
- rustup
- texlive-basic
- texlive-binextra
- texlive-latex
- texlive-latexextra
- ttf-liberation
- ttf-nerd-fonts-symbols
- universal-ctags
- uv
- virt-manager
- xarchiver
- xournalpp
- zstd
enabled_services:
- NetworkManager
- avahi-daemon
- bluetooth
- cups
- gdm
- libvirtd
- ufw
desktop_systemd_user_services:
- ssh-agent.service
- emacs.service
- syncthing.service
- rclone-pcloud.service

161
ansible/inventory/group_vars/desktop.yml
View File

@@ -6,113 +6,6 @@ desktop_sessions_enabled:
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
- emptty
- pinentry-emacs
- pinentry-gtk
- turnstile
- udiskie
- xdg-desktop-portal
- xdg-desktop-portal-gtk
- xdg-user-dirs
desktop_i3_packages:
- arandr
- autorandr
- feh
- i3
- i3blocks
- i3blocks-blocklets
- i3lock-color
- i3status
- dunst
- network-manager-applet
- rofi
- scrot
- setxkbmap
- blueman
- volumeicon
- xclip
- xfce-polkit
- xfce4-clipman-plugin
- xfce4-screenshooter
- xkbutils
- xorg-fonts
- xorg-minimal
- xss-lock
desktop_sway_packages:
- grim
- kanshi
- slurp
- swayfx
- wl-clipboard
- xdg-desktop-portal-wlr
profile_packages:
- alacritty
- bluez
- bridge-utils
- ctags
- firefox
- deluge-gtk
- dnsmasq
- emacs-gtk3
- poppler-glib
- poppler-utils
- exo
- fontconfig-devel
- freetype-devel
- gvfs-cdda
- gvfs-mtp
- gvfs-smb
- gufw
- libvirt
- libspa-bluetooth
- libreoffice
- liberation-fonts-ttf
- libvterm-devel
- libX11-devel
- libXft-devel
- meld
- mpv
- nerd-fonts-ttf
- nerd-fonts-symbols-ttf
- pdfarranger
- playerctl
- qemu
- qemu-firmware
- qemu-img
- qemu-tools
- remmina
- ripgrep
- rustup
- ristretto
- rsync
- shotwell
- ruff
- terminus-font
- texlive
- ty
- tumbler
- uv
- Thunar
- thunar-archive-plugin
- thunar-volman
- ffmpegthumbnailer
- virt-manager
- virt-manager-tools
- wireplumber
- xarchiver
- xournalpp
- yaru
- yaru-plus
- zstd
desktop_source_tools:
- name: st
@@ -189,14 +82,42 @@ desktop_common_dotfiles:
src: .config/udiskie/
dest: .config/udiskie/
mode: preserve
- name: Turnstile user services
src: .config/service/
dest: .config/service/
mode: preserve
- name: Bash profile fragments
src: .bashrc.d/
dest: .bashrc.d/
mode: preserve
- name: Bash cargo env fragment
src: .bashrc.d/08-cargo-env.sh
dest: .bashrc.d/08-cargo-env.sh
mode: "0644"
- name: Bash GPG TTY fragment
src: .bashrc.d/10-gpg-tty.sh
dest: .bashrc.d/10-gpg-tty.sh
mode: "0644"
- name: Bash man page colors fragment
src: .bashrc.d/12-manpages.sh
dest: .bashrc.d/12-manpages.sh
mode: "0644"
- name: Bash DBus session fragment
src: .bashrc.d/14-dbus-session.sh
dest: .bashrc.d/14-dbus-session.sh
mode: "0644"
- name: Bash SSH agent socket fragment
src: .bashrc.d/16-ssh-agent-socket.sh
dest: .bashrc.d/16-ssh-agent-socket.sh
mode: "0644"
- name: Bash editor fragment
src: .bashrc.d/20-editor-desktop.sh
dest: .bashrc.d/20-editor-desktop.sh
mode: "0644"
- name: Bash Emacs client fragment
src: .bashrc.d/25-emacs-client-desktop.sh
dest: .bashrc.d/25-emacs-client-desktop.sh
mode: "0644"
- name: Bash VM helper fragment
src: .bashrc.d/30-runvm.sh
dest: .bashrc.d/30-runvm.sh
mode: "0644"
- name: Bash Ansible playbook helper fragment
src: .bashrc.d/50-ap.sh
dest: .bashrc.d/50-ap.sh
mode: "0644"
- name: .gitignore_global
src: .gitignore_global
dest: .gitignore_global
@@ -221,10 +142,6 @@ desktop_common_dotfiles:
src: .local/bin/setup-gtk-theme
dest: .local/bin/setup-gtk-theme
mode: "0755"
- name: Turnstile environment update script
src: .local/bin/update-turnstile-env
dest: .local/bin/update-turnstile-env
mode: "0755"
- name: Udiskie password helper
src: .local/bin/udiskie-password
dest: .local/bin/udiskie-password
@@ -238,6 +155,12 @@ desktop_common_dotfiles:
dest: .ssh/config
mode: "0600"
desktop_arch_dotfiles:
- name: systemd user services
src: .config/systemd/user/
dest: .config/systemd/user/
mode: preserve
desktop_emacs_dotfiles:
- name: Emacs config
src: .emacs.d/

122
ansible/inventory/group_vars/void.yml
View File

@@ -79,3 +79,125 @@ enabled_services:
- ufw
- virtlockd
- virtlogd
desktop_restart_emptty_automatically: false
desktop_emptty_session_error_logging: disabled
desktop_void_dotfiles:
- name: Turnstile user services
src: .config/service/
dest: .config/service/
mode: preserve
- name: Bash runit desktop fragment
src: .bashrc.d/15-runit-desktop.sh
dest: .bashrc.d/15-runit-desktop.sh
mode: "0644"
- name: Turnstile environment update script
src: .local/bin/update-turnstile-env
dest: .local/bin/update-turnstile-env
mode: "0755"
desktop_common_packages:
- brightnessctl
- dex
- emptty
- pinentry-emacs
- pinentry-gtk
- turnstile
- udiskie
- xdg-desktop-portal
- xdg-desktop-portal-gtk
- xdg-user-dirs
desktop_i3_packages:
- arandr
- autorandr
- feh
- i3
- i3blocks
- i3blocks-blocklets
- i3lock-color
- i3status
- dunst
- network-manager-applet
- rofi
- scrot
- setxkbmap
- blueman
- volumeicon
- xclip
- xfce-polkit
- xfce4-clipman-plugin
- xfce4-screenshooter
- xkbutils
- xorg-fonts
- xorg-minimal
- xss-lock
desktop_sway_packages:
- grim
- kanshi
- slurp
- swayfx
- wl-clipboard
- xdg-desktop-portal-wlr
profile_packages:
- alacritty
- bluez
- bridge-utils
- ctags
- firefox
- deluge-gtk
- dnsmasq
- emacs-gtk3
- poppler-glib
- poppler-utils
- exo
- fontconfig-devel
- freetype-devel
- gvfs-cdda
- gvfs-mtp
- gvfs-smb
- gufw
- libvirt
- libspa-bluetooth
- libreoffice
- liberation-fonts-ttf
- libvterm-devel
- libX11-devel
- libXft-devel
- meld
- mpv
- nerd-fonts-ttf
- nerd-fonts-symbols-ttf
- pdfarranger
- playerctl
- qemu
- qemu-firmware
- qemu-img
- qemu-tools
- remmina
- ripgrep
- rustup
- ristretto
- rsync
- shotwell
- ruff
- terminus-font
- texlive
- ty
- tumbler
- uv
- Thunar
- thunar-archive-plugin
- thunar-volman
- ffmpegthumbnailer
- virt-manager
- virt-manager-tools
- wireplumber
- xarchiver
- xournalpp
- yaru
- yaru-plus
- zstd

58
ansible/inventory/host_vars/nymph.yml
View File

@@ -2,55 +2,27 @@
hostname: nymph
desktop_sessions_enabled:
- i3
- gnome
desktop_default_session: i3
desktop_default_session_env: xorg
desktop_emptty_session_error_logging: rotate
desktop_default_session: gnome
desktop_default_session_env: wayland
host_xbps_repositories:
- name: noctalia
url: https://universalrepo.r1xelelo.workers.dev/void
host_grub_cmdline_linux: >-
rd.luks.uuid=1e15d159-5d05-4a1f-9639-ac200dff9f9c rootflags=subvol=@
apparmor=1 security=apparmor nouveau.modeset=0 nvidia-drm.modeset=1
host_packages:
- cliphist
- grimshot
- grub
- intel-media-driver
- libva-intel-driver
- mesa
- nvidia
- linux-mainline-headers
- noctalia-shell
- nvidia-settings
- nvidia-utils
- power-profiles-daemon
- mesa-dri
- vulkan-loader
- mesa-vulkan-intel
- intel-video-accel
- tlp
- tlp-rdw
- upower
- vulkan-icd-loader
- vulkan-intel
host_enabled_services:
- tlp
host_sway_dotfiles:
- src: .config/sway/host.conf
dest: .config/sway/host.conf
mode: "0644"
- src: .config/sway/session-env
dest: .config/sway/session-env
mode: "0644"
- src: .config/kanshi/config
dest: .config/kanshi/config
mode: "0644"
noctalia_bar_monitors:
- DP-1
- eDP-1
noctalia_screen_overrides:
- name: DP-1
enabled: false
- name: eDP-1
enabled: false
host_packages_absent:
- network-manager-applet
- blueman
- power-profiles-daemon

11
ansible/inventory/hosts.yml
View File

@@ -5,8 +5,10 @@ all:
hosts:
ikaros:
ansible_connection: local
nymph:
ansible_connection: local
arch:
children:
arch_desktop:
desktop:
hosts:
@@ -55,6 +57,11 @@ all:
deadalus-fedora:
ansible_connection: local
arch_desktop:
hosts:
nymph:
ansible_connection: local
workstation_host_linux:
hosts:
deadalus-ubuntu:

4
ansible/roles/dotfiles_common/tasks/main.yml
View File

@@ -14,7 +14,7 @@
group: "{{ effective_user_group }}"
mode: "0755"
loop: "{{ xdg_user_directories | default([]) }}"
when: "'void' in group_names"
when: "'desktop' in group_names"
- name: Extract templates kit to Templates directory
tags: [dotfiles, dotfiles:common]
@@ -23,7 +23,7 @@
dest: "{{ effective_user_home }}/Templates"
owner: "{{ effective_username }}"
group: "{{ effective_user_group }}"
when: "'void' in group_names"
when: "'desktop' in group_names"
- name: Ensure SSH socket directory exists
tags: [dotfiles, dotfiles:common]

27
ansible/roles/packages_arch/tasks/main.yml Normal file
View File

@@ -0,0 +1,27 @@
---
- name: Synchronize and upgrade Arch Linux packages
tags: [packages]
community.general.pacman:
update_cache: true
upgrade: true
- name: Install packages on Arch Linux
tags: [packages]
community.general.pacman:
name: >-
{{
(
(common_packages | default([]))
+ (arch_packages_base | default([]))
+ (arch_desktop_common_packages | default([]))
+ (
(arch_desktop_gnome_packages | default([]))
if 'gnome' in (desktop_sessions_enabled | default([]))
else []
)
+ (arch_profile_packages | default([]))
+ (host_packages | default([]))
)
| unique
}}
state: present

17
ansible/roles/profile_desktop_common/handlers/main.yml
View File

@@ -5,6 +5,7 @@
changed_when: true
when:
- not ansible_check_mode
- "'void' in group_names"
- desktop_restart_emptty_automatically | default(false)
- name: Report manual emptty restart requirement
@@ -16,10 +17,22 @@
to avoid dropping the active graphical session.
when:
- not ansible_check_mode
- "'void' in group_names"
- not (desktop_restart_emptty_automatically | default(false))
- name: Reload SSH service
- name: Reload SSH service with runit
listen: Reload SSH service
ansible.builtin.command: sv reload sshd
changed_when: true
when: not ansible_check_mode
when:
- not ansible_check_mode
- "'void' in group_names"
- name: Reload SSH service with systemd
listen: Reload SSH service
ansible.builtin.systemd:
name: "{{ desktop_ssh_service_name | default('sshd') }}"
state: reloaded
when:
- not ansible_check_mode
- "'arch' in group_names"

48
ansible/roles/profile_desktop_common/tasks/main.yml
View File

@@ -6,6 +6,7 @@
regexp: '^#?HandleLidSwitch='
line: 'HandleLidSwitch=suspend'
state: present
when: "'void' in group_names"
- name: Ensure common config directories exist
tags: [dotfiles, dotfiles:desktop]
@@ -22,6 +23,9 @@
- "{{ user_home }}/.config/alacritty"
- "{{ user_home }}/.config/Thunar"
- "{{ user_home }}/.config/rofi"
- "{{ user_home }}/.config/systemd"
- "{{ user_home }}/.config/systemd/user"
- "{{ user_home }}/.bashrc.d"
- "{{ user_home }}/.tmux"
- "{{ user_home }}/.tmux/bin"
- "{{ user_home }}/.tmux/plugins"
@@ -42,6 +46,7 @@
insertafter: '^auth\s+include\s+system-local-login$'
line: "auth optional pam_gnome_keyring.so"
state: present
when: "'void' in group_names"
- name: Enable gnome-keyring PAM session hook
tags: [packages, gnome]
@@ -50,6 +55,7 @@
insertafter: '^session\s+include\s+system-local-login$'
line: "session optional pam_gnome_keyring.so auto_start"
state: present
when: "'void' in group_names"
- name: Enable gnome-keyring PAM password hook
tags: [packages, gnome]
@@ -58,6 +64,7 @@
insertafter: '^password\s+include\s+system-local-login$'
line: "password optional pam_gnome_keyring.so use_authtok"
state: present
when: "'void' in group_names"
- name: Check whether SSH host ed25519 key exists
tags: [services]
@@ -181,6 +188,7 @@
ansible.builtin.stat:
path: /etc/sv/libvirtd
register: libvirtd_service_dir
when: "'void' in group_names"
- name: Enable libvirt daemon service
tags: [packages, services]
@@ -188,7 +196,9 @@
src: /etc/sv/libvirtd
dest: /var/service/libvirtd
state: link
when: libvirtd_service_dir.stat.exists
when:
- "'void' in group_names"
- libvirtd_service_dir.stat.exists
- name: Check virtualization group availability
tags: [packages]
@@ -229,6 +239,7 @@
owner: root
group: root
mode: "0755"
when: "'void' in group_names"
- name: Ensure emptty session directories exist
tags: [packages, services, emptty]
@@ -241,6 +252,7 @@
loop:
- /etc/emptty/xsessions
- /etc/emptty/wayland-sessions
when: "'void' in group_names"
- name: Configure emptty
tags: [packages, services, emptty]
@@ -251,6 +263,7 @@
group: root
mode: "0644"
notify: Restart emptty
when: "'void' in group_names"
- name: Copy common desktop dotfiles
tags: [dotfiles, dotfiles:desktop]
@@ -260,10 +273,41 @@
owner: "{{ username }}"
group: "{{ user_group }}"
mode: "{{ item.mode }}"
loop: "{{ desktop_common_dotfiles | default([]) }}"
loop: >-
{{
(desktop_common_dotfiles | default([]))
+ ((desktop_void_dotfiles | default([])) if 'void' in group_names else [])
+ ((desktop_arch_dotfiles | default([])) if 'arch' in group_names else [])
}}
loop_control:
label: "{{ item.dest }}"
- name: Ensure systemd user enablement directory exists
tags: [services, dotfiles, dotfiles:desktop]
ansible.builtin.file:
path: "{{ user_home }}/.config/systemd/user/default.target.wants"
state: directory
owner: "{{ username }}"
group: "{{ user_group }}"
mode: "0755"
when:
- "'arch' in group_names"
- (desktop_systemd_user_services | default([])) | length > 0
- name: Enable desktop systemd user services
tags: [services, dotfiles, dotfiles:desktop]
ansible.builtin.file:
src: "{{ user_home }}/.config/systemd/user/{{ item }}"
dest: "{{ user_home }}/.config/systemd/user/default.target.wants/{{ item }}"
state: link
owner: "{{ username }}"
group: "{{ user_group }}"
force: true
loop: "{{ desktop_systemd_user_services | default([]) }}"
loop_control:
label: "{{ item }}"
when: "'arch' in group_names"
- name: Copy Emacs desktop dotfiles
tags: [dotfiles, dotfiles:desktop, emacs]
ansible.builtin.copy:

18
ansible/roles/profile_desktop_gnome/tasks/main.yml Normal file
View File

@@ -0,0 +1,18 @@
---
- name: Ensure GNOME desktop session is enabled for this profile
tags: [gnome]
ansible.builtin.assert:
that:
- "'gnome' in (desktop_sessions_enabled | default([]))"
fail_msg: >-
profile_desktop_gnome requires desktop_sessions_enabled to include gnome.
- name: Ensure systemd boots to the graphical target
tags: [services, gnome]
ansible.builtin.file:
src: /usr/lib/systemd/system/graphical.target
dest: /etc/systemd/system/default.target
state: link
force: true
owner: root
group: root

7
ansible/roles/profile_desktop_host/tasks/nymph.yml
View File

@@ -4,13 +4,18 @@
ansible.builtin.lineinfile:
path: /etc/default/grub
regexp: '^GRUB_CMDLINE_LINUX='
line: 'GRUB_CMDLINE_LINUX="rd.luks.uuid=1e15d159-5d05-4a1f-9639-ac200dff9f9c rootflags=subvol=@ apparmor=1 security=apparmor nouveau.modeset=0 nvidia-drm.modeset=1"'
line: 'GRUB_CMDLINE_LINUX="{{ host_grub_cmdline_linux }}"'
state: present
register: nymph_grub_cmdline
when: host_grub_cmdline_linux is defined
- name: Regenerate GRUB configuration
tags: [packages, nvidia]
ansible.builtin.command: grub-mkconfig -o /boot/grub/grub.cfg
changed_when: true
when:
- host_grub_cmdline_linux is defined
- nymph_grub_cmdline is changed
- name: Configure NVIDIA power management for hybrid graphics
tags: [packages, nvidia]

10
ansible/site.yml
View File

@@ -28,6 +28,16 @@
- profile_desktop_sway
- profile_desktop_host
- hosts: arch
become: true
roles:
- packages_arch
- services_systemd
- profile_desktop_common
- profile_desktop_gnome
- profile_desktop_host
- hosts: workstation_dev_ubuntu
become: true