Add Niri desktop configuration with integrated utilities

- Introduced a new power menu script using fuzzel for session management. - Updated Bellerophon configuration to include Niri desktop and its components. - Removed obsolete README for Niri and consolidated its configuration files. - Added swayidle and swaylock integration for idle management and screen locking. - Implemented waybar for status bar functionality with basic configuration. - Created fuzzel integration for application launching and menu access. - Added zenbook debugging scripts for display and keyboard diagnostics. - Migrated keyring and other configurations to streamline Niri setup. - Enhanced display management with systemd services for better integration.
2025-10-02 13:16:27 -03:00
parent 66e65b91ea
commit ca62a6bd19
20 changed files with 973 additions and 448 deletions
--- a/docs/uwsm-migration-summary.md
+++ b/docs/uwsm-migration-summary.md
@@ -0,0 +1,185 @@
+# UWSM Migration Complete ✅
+
+## Summary
+
+The Niri desktop environment has been **fully migrated** to UWSM (Universal Wayland Session Manager) for comprehensive systemd-based session management.
+
+## What Changed
+
+### 1. Session Launch (Host-Level)
+
+**Before:**
+- Manual desktop entry files in `/etc/wayland-sessions/`
+- Manual UWSM package installation
+
+**After:**
+```nix
+programs.uwsm = {
+  enable = true;
+  waylandCompositors.niri = {
+    prettyName = "Niri";
+    comment = "Niri scrollable-tiling Wayland compositor managed by UWSM";
+    binPath = "/run/current-system/sw/bin/niri-session";
+  };
+};
+```
+
+### 2. Startup Applications (Home-Manager)
+
+**Before:** Using `programs.niri.settings.spawn-at-startup`
+
+**After:** Using `systemd.user.services` with proper targets
+
+| Service | Type | Purpose |
+|---------|------|---------|
+| `nm-applet` | simple | Network manager tray icon |
+| `zenbook-autostart` | oneshot | Initial display setup |
+| `zenbook-delayed-setup` | oneshot | Secondary setup after delay |
+| `zenbook-inotify-monitor` | simple | DRM status change monitor |
+| `zenbook-udev-monitor` | simple | udev event monitor |
+
+All services:
+- `PartOf = ["graphical-session.target"]` - proper lifecycle
+- `After = ["graphical-session.target"]` - correct ordering  
+- `WantedBy = ["graphical-session.target"]` - auto-start
+- `Restart` policies for resilience
+
+### 3. Application Launches (Keybinds)
+
+**Before:** Direct binary execution
+```nix
+programs.niri.settings.binds."Mod+Return".action.spawn = ["${pkgs.fuzzel}/bin/fuzzel"];
+```
+
+**After:** UWSM app wrapper
+```nix
+programs.niri.settings.binds."Mod+Return".action.spawn = ["uwsm" "app" "--" "${pkgs.fuzzel}/bin/fuzzel"];
+```
+
+All keybinds now use `uwsm app --`:
+- `Mod+Return` → fuzzel launcher
+- `Mod+L` → swaylock
+- `Mod+Z` → zenbook-set-displays
+
+### 4. Fuzzel Launcher Configuration
+
+Fuzzel now has `launch-prefix` configured:
+```nix
+settings.main.launch-prefix = "uwsm app -- ";
+```
+
+This means apps launched from fuzzel are automatically placed in the correct systemd slice.
+
+## Benefits Achieved
+
+1. **✅ Environment Variable Inheritance**
+   - Login shell → PAM → systemd → compositor → applications
+   - All environment properly propagated
+
+2. **✅ Systemd Integration**
+   - All services bound to `graphical-session.target`
+   - Proper dependency ordering and lifecycle management
+
+3. **✅ Application Slicing**
+   - Apps launched via `uwsm app --` go into `app-graphical.slice`
+   - Better resource management and isolation
+
+4. **✅ Clean Shutdown**
+   - Proper cleanup when session ends
+   - Services stopped in correct order
+
+5. **✅ Resilience**
+   - Services auto-restart on failure
+   - Configurable restart policies
+
+6. **✅ Standards Compliance**
+   - Follows systemd graphical session standards
+   - Compatible with XDG autostart (if needed)
+
+## How to Use
+
+### From Display Manager
+
+Select **"Niri"** from your display manager (GDM, SDDM, etc.)
+
+The session is now automatically launched via UWSM with full session management.
+
+### From TTY
+
+```bash
+# Launch via UWSM
+uwsm start niri
+```
+
+### Verify UWSM is Active
+
+```bash
+# Check UWSM status
+uwsm status
+
+# List UWSM-managed units
+systemctl --user list-units 'wayland-*'
+
+# Check graphical session services
+systemctl --user list-units --type=service | grep graphical
+```
+
+## Monitoring
+
+```bash
+# Check specific service
+systemctl --user status nm-applet
+
+# View logs
+journalctl --user -u zenbook-inotify-monitor -f
+
+# List all services in graphical session
+systemctl --user list-dependencies graphical-session.target
+```
+
+## Files Modified
+
+| File | Changes |
+|------|---------|
+| `hosts/common/optional/niri.nix` | Added `programs.uwsm` module |
+| `home/.../niri/waybar.nix` | nm-applet → systemd service |
+| `home/.../niri/zenbook-screen.nix` | All tools → systemd services, keybind uses `uwsm app` |
+| `home/.../niri/fuzzel.nix` | Keybind + launch-prefix use `uwsm app` |
+| `home/.../niri/swaylock.nix` | Keybind uses `uwsm app` |
+| `docs/uwsm-niri-integration.md` | Updated documentation |
+
+## Testing
+
+After rebuilding:
+
+1. Log out and select "Niri" from display manager
+2. Log in and verify all components work:
+   - Waybar appears with tray icons
+   - nm-applet icon visible in tray
+   - `Mod+Return` opens fuzzel
+   - `Mod+L` locks screen
+   - Zenbook displays configured correctly
+
+3. Check systemd services:
+   ```bash
+   systemctl --user status nm-applet waybar zenbook-autostart
+   ```
+
+4. Launch an app from fuzzel and verify it's in the right slice:
+   ```bash
+   systemctl --user list-units --type=service | grep app-
+   ```
+
+## Documentation
+
+See `docs/uwsm-niri-integration.md` for:
+- Detailed UWSM concepts
+- Troubleshooting guide
+- Advanced configuration options
+- Environment variable management
+
+## References
+
+- [UWSM GitHub](https://github.com/vladimir-csp/uwsm)
+- [NixOS UWSM Module](https://mynixos.com/nixpkgs/options/programs.uwsm)
+- [UWSM Documentation](https://github.com/vladimir-csp/uwsm/blob/master/README.md)
--- a/docs/uwsm-niri-integration.md
+++ b/docs/uwsm-niri-integration.md
@@ -0,0 +1,248 @@
+# UWSM Integration with Niri
+
+## Status: ✅ FULLY INTEGRATED
+
+This Niri configuration has been **fully migrated** to use UWSM (Universal Wayland Session Manager) for comprehensive systemd-based session management.
+
+All components now use UWSM:
+- ✅ Session launch via `programs.uwsm.waylandCompositors`
+- ✅ Startup applications via `systemd.user.services` with `graphical-session.target`
+- ✅ Application launches via `uwsm app --` wrapper (for proper systemd slice placement)
+- ✅ Fuzzel launcher configured with UWSM launch-prefix
+
+## Overview
+
+UWSM (Universal Wayland Session Manager) is a systemd-based session manager that provides:
+
+1. **Proper environment variable inheritance** - Ensures environment variables from login shells, PAM, and system profiles are properly propagated to the Wayland session and all child processes
+2. **Systemd integration** - Wraps the compositor in proper systemd units with lifecycle management
+3. **XDG autostart support** - Handles XDG autostart applications with proper slices and dependencies
+4. **Clean startup/shutdown** - Manages session lifecycle with proper cleanup on exit
+5. **Session binding** - Can bind session lifecycle to login shell PID for proper TTY management
+
+## Benefits for Niri
+
+Currently, our Niri setup uses:
+- `programs.niri.settings.spawn-at-startup` for starting applications like nm-applet
+- `programs.waybar.systemd.enable = true` for waybar systemd service
+- Manual systemd user services for various components
+
+With UWSM:
+- All startup applications would be managed consistently through systemd units
+- Environment variables would be properly inherited from login shell → PAM → systemd → compositor → applications
+- Better integration with systemd targets (`graphical-session.target`, etc.)
+- Proper cleanup on logout/shutdown
+- XDG autostart applications would work automatically
+- Better compatibility with applications that expect standard Wayland session management
+
+## Implementation Plan
+
+### 1. Host-Level Changes (`hosts/common/optional/niri.nix`)
+
+Add UWSM package and configure it:
+
+```nix
+environment.systemPackages = with pkgs; [
+  uwsm
+];
+```
+
+Enable UWSM mode for Niri (if the niri-flake supports it), or configure it manually.
+
+### 2. User-Level Changes (`home/panotaka/common/optional/desktops/niri/`)
+
+#### Option A: Use UWSM's systemd units (Recommended)
+
+Remove manual `spawn-at-startup` entries and rely on:
+- Systemd user services with `WantedBy=graphical-session.target`
+- XDG autostart desktop entries
+- UWSM's built-in environment preparation
+
+#### Option B: Hybrid Approach
+
+Keep some `spawn-at-startup` for compositor-specific tools, but use UWSM for:
+- Environment variable management
+- Session lifecycle binding
+- XDG autostart apps
+
+### 3. Migration Path
+
+1. **Phase 1**: Add UWSM package and test manual invocation
+   ```bash
+   uwsm start -o niri
+   systemctl --user start wayland-wm@niri.service
+   ```
+
+2. **Phase 2**: Migrate startup applications to systemd services
+   - Convert `spawn-at-startup` entries to `systemd.user.services`
+   - Use `WantedBy = ["graphical-session.target"]` for dependency
+
+3. **Phase 3**: Create UWSM desktop entry for display managers
+   ```desktop
+   [Desktop Entry]
+   Name=Niri (with UWSM)
+   Comment=Niri Wayland compositor with UWSM session management
+   Exec=uwsm start -D niri -N Niri -C "Niri compositor" -- niri
+   Type=Application
+   DesktopNames=niri
+   ```
+
+4. **Phase 4**: Configure environment finalization
+   - Have Niri execute `uwsm finalize` in its config to propagate compositor-specific variables
+
+## Current State
+
+### What Uses `spawn-at-startup` Currently:
+- `Restart` policies for resilience
+
+#### 3. Application Launches → UWSM App Wrapper
+
+All applications launched from Niri now use `uwsm app --` wrapper:
+
+- **Fuzzel launcher**: `uwsm app -- fuzzel`
+  - Also configured with `launch-prefix = "uwsm app -- "` so apps launched from fuzzel are properly managed
+- **Swaylock**: `uwsm app -- swaylock` (Mod+L keybind)
+- **Zenbook tools**: `uwsm app -- zenbook-set-displays` (Mod+Z keybind)
+
+This ensures all applications are placed in the correct systemd slices (`app-graphical.slice`) and inherit proper environment variables.
+
+### Files Modified
+
+1. **`hosts/common/optional/niri.nix`**
+   - Replaced manual desktop entries with `programs.uwsm` module
+   - Configured Niri as a UWSM-managed compositor
+   
+2. **`home/panotaka/common/optional/desktops/niri/waybar.nix`**
+   - Migrated nm-applet from spawn-at-startup to systemd.user.services.nm-applet
+   
+3. **`home/panotaka/common/optional/desktops/niri/zenbook-screen.nix`**
+   - Migrated all zenbook display management tools to systemd services:
+     - zenbook-autostart (oneshot initial setup)
+     - zenbook-delayed-setup (delayed secondary setup)
+     - zenbook-inotify-monitor (long-running DRM status watcher)
+     - zenbook-udev-monitor (long-running udev event watcher)
+   - Updated Mod+Z keybind to use `uwsm app --`
+
+4. **`home/panotaka/common/optional/desktops/niri/fuzzel.nix`**
+   - Updated keybind to launch fuzzel via `uwsm app --`
+   - Added `launch-prefix = "uwsm app -- "` to fuzzel config
+
+5. **`home/panotaka/common/optional/desktops/niri/swaylock.nix`**
+   - Updated Mod+L keybind to launch swaylock via `uwsm app --`
+
+### Files Modified
+
+1. **`home/panotaka/common/optional/desktops/niri/waybar.nix`**
+   - Migrated nm-applet from spawn-at-startup to systemd.user.services.nm-applet
+   
+2. **`home/panotaka/common/optional/desktops/niri/zenbook-screen.nix`**
+
+### What Already Uses Systemd:
+- `programs.waybar.systemd.enable = true`
+- polkit-kde-authentication-agent-1
+
+## Recommendation
+
+For now, I recommend a **soft introduction** of UWSM:
+
+1. **Add UWSM package** to the system so it's available
+2. **Document how to use it** (this file)
+3. **Keep current setup** working as-is
+4. **Provide opt-in migration path** for users who want systemd-managed session
+
+Later, when fully tested, we can:
+- Make UWSM the default
+- Migrate all startup apps to systemd services
+- Remove manual `spawn-at-startup` entries
+- Add UWSM desktop entry for GDM/SDDM
+
+### Systemd User Services (graphical-session.target)
+
+These services start automatically when the graphical session begins:
+
+- **waybar** (via programs.waybar.systemd.enable)
+- **nm-applet** (network manager applet for tray)
+- **polkit-kde-authentication-agent-1** (authentication dialogs)
+- **zenbook-autostart** (initial display setup)
+- **zenbook-delayed-setup** (secondary setup after delay)
+- **zenbook-inotify-monitor** (DRM status change monitoring)
+- **zenbook-udev-monitor** (udev event monitoring)
+
+## Monitoring and Debugging
+
+### Check Service Status
+
+```bash
+# List all graphical session services
+systemctl --user list-units --type=service | grep graphical
+
+# Check specific service
+systemctl --user status nm-applet
+systemctl --user status zenbook-autostart
+
+# View logs
+journalctl --user -u nm-applet -f
+journalctl --user -u zenbook-inotify-monitor -f
+```
+
+### UWSM Session Management
+
+```bash
+# Check current UWSM session
+uwsm status
+
+# List UWSM-managed units
+systemctl --user list-units 'wayland-*'
+
+# Stop session cleanly
+uwsm stop
+```
+
+## Troubleshooting
+
+### Service Not Starting
+
+```bash
+# Check why service failed
+systemctl --user status <service-name>
+journalctl --user -u <service-name> -n 50
+
+# Manually start for testing
+systemctl --user start <service-name>
+```
+
+### Environment Variables Missing
+
+UWSM should automatically propagate environment variables. If something is missing:
+
+```bash
+# Check what's in systemd's environment
+systemctl --user show-environment
+
+# Manually import if needed (shouldn't be necessary with UWSM)
+systemctl --user import-environment VARIABLE_NAME
+```
+
+## Testing UWSM
+
+To test UWSM without changing your current setup:
+
+```bash
+# Generate units without starting
+uwsm start -o niri
+
+# Check generated units
+systemctl --user list-units 'wayland-*'
+
+# Start manually
+systemctl --user start wayland-wm@niri.service
+
+# Stop
+uwsm stop
+```
+
+## References
+
+- UWSM GitHub: https://github.com/vladimir-csp/uwsm
+- UWSM in NixOS: Available as `pkgs.uwsm`
+- Hyprland UWSM integration: `programs.hyprland.withUWSM` option exists in nixpkgs