Move nymph to target Void+Niri

ansible/inventory/group_vars/desktop_niri.yml

@@ -1,3 +1,5 @@
 ---
 desktop_profile: niri
+desktop_sessions_enabled:
+  - niri
 desktop_default_session: niri

ansible/inventory/group_vars/void.yml

@@ -221,6 +221,28 @@ desktop_hyprland_packages:
   - xdg-desktop-portal-hyprland
   - xorg-server-xwayland
 
+desktop_niri_packages:
+  - cliphist
+  - dunst
+  - foot
+  - foot-terminfo
+  - gtklock
+  - grim
+  - niri
+  - rofi
+  - slurp
+  - SwayOSD
+  - Waybar
+  - wl-clipboard
+  - xdg-desktop-portal-gtk
+  - xorg-server-xwayland
+
+void_lab_packages:
+  - llvm
+  - podman
+  - qemu
+  - smartmontools
+
 profile_packages:
   - bash-language-server
   - bluez

ansible/inventory/host_vars/nymph.yml

@@ -1,7 +1,7 @@
 ---
 hostname: nymph
 
-# FreeBSD/Niri laptop target. Keep host-specific packages empty until hardware
+# Void Linux/Niri laptop target. Keep host-specific packages empty until hardware
 # support is verified on the installed system.
 host_packages: []
 host_enabled_services: []

ansible/inventory/hosts.yml

@@ -2,7 +2,9 @@
 all:
   children:
     platform_void:
-      hosts: {}
+      hosts:
+        nymph:
+          ansible_connection: local
 
     platform_mint:
       hosts:
@@ -10,9 +12,7 @@ all:
           ansible_connection: local
 
     platform_freebsd:
-      hosts:
-        nymph:
-          ansible_connection: local
+      hosts: {}
 
     void:
       children:

ansible/roles/packages_void/tasks/main.yml

@@ -76,6 +76,14 @@
             )
             else []
           )
+        + (
+            (desktop_niri_packages | default([]))
+            if (
+              (desktop_environment | default('minimal')) == 'minimal'
+              and 'niri' in (desktop_sessions_enabled | default([]))
+            )
+            else []
+          )
         | unique
       }}
 
@@ -88,6 +96,7 @@
           (desktop_minimal_packages | default([]))
           + (desktop_sway_packages | default([]))
           + (desktop_hyprland_packages | default([]))
+          + (desktop_niri_packages | default([]))
           + (desktop_xfce_packages | default([]))
           + (desktop_kde_packages | default([]))
         )
@@ -109,6 +118,7 @@
         + (desktop_common_packages | default([]))
         + ((desktop_emacs_packages | default([])) if (emacs_enabled | default(false) | bool) else [])
         + (packages_void_selected_desktop_packages | default([]))
+        + ((void_lab_packages | default([])) if 'role_lab' in group_names else [])
         + (host_packages | default([]))
         )
         | unique

ansible/roles/profile_desktop_common/tasks/main.yml

@@ -9,7 +9,7 @@
         or (desktop_sessions_enabled | default([]) | length > 0)
       - >-
         (desktop_environment | default('minimal')) != 'minimal'
-        or (desktop_sessions_enabled | default([]) | difference(['sway', 'hyprland']) | length == 0)
+        or (desktop_sessions_enabled | default([]) | difference(['sway', 'hyprland', 'niri']) | length == 0)
       - >-
         (desktop_environment | default('minimal')) != 'minimal'
         or desktop_default_session in (desktop_sessions_enabled | default([]))

ansible/roles/profile_desktop_niri/files/niri-portals.conf

@@ -0,0 +1,4 @@
+[preferred]
+default=gtk
+org.freedesktop.impl.portal.Screenshot=gtk
+org.freedesktop.impl.portal.ScreenCast=gtk

ansible/roles/profile_desktop_niri/files/niri.desktop

@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=Niri
+Comment=Niri scrollable-tiling (Wayland)
+Exec=/usr/local/bin/start-niri
+Type=Application

ansible/roles/profile_desktop_niri/tasks/main.yml

@@ -0,0 +1,81 @@
+---
+- name: Ensure niri config directories exist
+  tags: [dotfiles, dotfiles:desktop, niri]
+  ansible.builtin.file:
+    path: "{{ item }}"
+    state: directory
+    owner: "{{ username }}"
+    group: "{{ user_group }}"
+    mode: "0755"
+  loop:
+    - "{{ user_home }}/.config/foot"
+    - "{{ user_home }}/.config/dunst"
+    - "{{ user_home }}/.config/rofi"
+    - "{{ user_home }}/.config/waybar"
+    - "{{ user_home }}/.config/niri"
+  when:
+    - (desktop_environment | default('minimal')) == 'minimal'
+    - "'niri' in (desktop_sessions_enabled | default([]))"
+
+- name: Install allowed emptty Wayland sessions
+  tags: [packages, services, emptty, niri]
+  ansible.builtin.copy:
+    src: niri.desktop
+    dest: /etc/emptty/wayland-sessions/niri.desktop
+    owner: root
+    group: root
+    mode: "0644"
+  when:
+    - (desktop_environment | default('minimal')) == 'minimal'
+    - "'niri' in (desktop_sessions_enabled | default([]))"
+
+- name: Install Niri session launcher in /usr/local/bin
+  tags: [packages, services, niri]
+  ansible.builtin.copy:
+    src: "{{ playbook_dir }}/../dotfiles/desktop/.local/bin/start-niri"
+    dest: /usr/local/bin/start-niri
+    owner: root
+    group: root
+    mode: "0755"
+  when:
+    - (desktop_environment | default('minimal')) == 'minimal'
+    - "'niri' in (desktop_sessions_enabled | default([]))"
+
+- name: Ensure /etc/xdg/xdg-desktop-portal exists
+  tags: [packages, services, niri, portal]
+  ansible.builtin.file:
+    path: /etc/xdg/xdg-desktop-portal
+    state: directory
+    owner: root
+    group: root
+    mode: "0755"
+  when:
+    - (desktop_environment | default('minimal')) == 'minimal'
+    - "'niri' in (desktop_sessions_enabled | default([]))"
+
+- name: Configure xdg-desktop-portal backend preferences for niri
+  tags: [packages, services, niri, portal]
+  ansible.builtin.copy:
+    src: niri-portals.conf
+    dest: /etc/xdg/xdg-desktop-portal/niri-portals.conf
+    owner: root
+    group: root
+    mode: "0644"
+  when:
+    - (desktop_environment | default('minimal')) == 'minimal'
+    - "'niri' in (desktop_sessions_enabled | default([]))"
+
+- name: Copy niri desktop dotfiles
+  tags: [dotfiles, dotfiles:desktop, niri]
+  ansible.builtin.copy:
+    src: "{{ playbook_dir }}/../dotfiles/desktop/{{ item.src }}"
+    dest: "{{ user_home }}/{{ item.dest }}"
+    owner: "{{ username }}"
+    group: "{{ user_group }}"
+    mode: "{{ item.mode }}"
+  loop: "{{ desktop_niri_dotfiles | default([]) }}"
+  loop_control:
+    label: "{{ item.dest }}"
+  when:
+    - (desktop_environment | default('minimal')) == 'minimal'
+    - "'niri' in (desktop_sessions_enabled | default([]))"

ansible/site.yml

@@ -38,10 +38,18 @@
     - profile_desktop_common
     - profile_desktop_sway
     - profile_desktop_hyprland
+    - profile_desktop_niri
     - profile_desktop_kde
     - profile_desktop_xfce
     - profile_desktop_host
 
+- name: Configure lab role on Void
+  hosts: platform_void:&role_lab
+  become: true
+
+  roles:
+    - profile_lab
+
 - name: Configure Linux Mint platform
   hosts: platform_mint
   become: true