Update FreeBSD profile with Niri

ansible/roles/packages_freebsd/tasks/main.yml

@@ -17,6 +17,11 @@
               if 'desktop_hyprland' in group_names
               else []
             )
+          + (
+              (freebsd_niri_packages | default([]))
+              if 'desktop_niri' in group_names
+              else []
+            )
           + (
               (freebsd_lab_packages | default([]))
               if 'role_lab' in group_names

ansible/roles/packages_mint/tasks/main.yml

@@ -19,6 +19,14 @@
               if 'graphical_desktop' in group_names
               else []
             )
+          + (
+              (mint_emacs_packages | default([]))
+              if (
+                'graphical_desktop' in group_names
+                and (emacs_enabled | default(false) | bool)
+              )
+              else []
+            )
           + (
               (mint_cinnamon_packages | default([]))
               if 'desktop_cinnamon' in group_names

ansible/roles/packages_void/tasks/main.yml

@@ -105,7 +105,9 @@
           (common_packages | default([]))
         + (void_packages_base | default([]))
         + (profile_packages | default([]))
+        + ((profile_emacs_packages | default([])) if (emacs_enabled | default(false) | bool) else [])
         + (desktop_common_packages | default([]))
+        + ((desktop_emacs_packages | default([])) if (emacs_enabled | default(false) | bool) else [])
         + (packages_void_selected_desktop_packages | default([]))
         + (host_packages | default([]))
         )

ansible/roles/profile_desktop_cinnamon/tasks/main.yml

@@ -40,6 +40,7 @@
     owner: "{{ username }}"
     group: "{{ user_group }}"
     mode: "0755"
+  when: emacs_enabled | default(false) | bool
 
 - name: Ensure GnuPG directory exists
   tags: [dotfiles, dotfiles:desktop, git]
@@ -71,6 +72,7 @@
     group: "{{ user_group }}"
     mode: "{{ item.mode }}"
   loop: "{{ desktop_emacs_dotfiles | default([]) }}"
+  when: emacs_enabled | default(false) | bool
   loop_control:
     label: "{{ item.dest }}"
 

ansible/roles/profile_desktop_common/tasks/main.yml

@@ -315,6 +315,7 @@
     group: "{{ user_group }}"
     mode: "{{ item.mode }}"
   loop: "{{ desktop_emacs_dotfiles | default([]) }}"
+  when: emacs_enabled | default(false) | bool
   loop_control:
     label: "{{ item.dest }}"
 
@@ -564,7 +565,7 @@
     label: "{{ item.name }}"
 
 - name: Install desktop Python tools with uv
-  tags: [packages, emacs]
+  tags: [packages]
   ansible.builtin.command:
     cmd: "uv tool install --upgrade {{ item }}"
   become: true

ansible/roles/profile_desktop_niri_freebsd/tasks/main.yml

@@ -0,0 +1,41 @@
+---
+- name: Ensure FreeBSD Niri user 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"
+    - "{{ user_home }}/.config/dunst"
+    - "{{ user_home }}/.config/foot"
+    - "{{ user_home }}/.config/niri"
+    - "{{ user_home }}/.config/rofi"
+    - "{{ user_home }}/.config/waybar"
+    - "{{ user_home }}/.local"
+    - "{{ user_home }}/.local/bin"
+    - "{{ user_home }}/.local/state"
+    - "{{ user_home }}/.local/state/ssh-agent"
+
+- name: Copy common Niri desktop dotfiles on FreeBSD
+  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 }}"
+
+- name: Render FreeBSD Niri session launcher
+  tags: [packages, services, niri]
+  ansible.builtin.template:
+    src: start-niri-session.j2
+    dest: /usr/local/bin/start-niri-session
+    owner: root
+    group: wheel
+    mode: "0755"

ansible/roles/profile_desktop_niri_freebsd/templates/start-niri-session.j2

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+[ -r /etc/profile ] && . /etc/profile
+[ -r "$HOME/.profile" ] && . "$HOME/.profile"
+
+export XDG_CURRENT_DESKTOP=niri
+export XDG_SESSION_DESKTOP=niri
+export XDG_SESSION_TYPE=wayland
+
+export MOZ_ENABLE_WAYLAND=1
+export QT_QPA_PLATFORM='wayland;xcb'
+export _JAVA_AWT_WM_NONREPARENTING=1
+export SDL_VIDEODRIVER=wayland
+export GDK_BACKEND='wayland,x11'
+
+export SSH_AUTH_SOCK="$HOME/.local/state/ssh-agent/socket"
+
+[ -r "$HOME/.config/niri/session-env" ] && . "$HOME/.config/niri/session-env"
+
+if command -v dbus-run-session >/dev/null 2>&1; then
+  exec dbus-run-session niri --session
+fi
+
+exec niri --session