Thomas Syms
ca62a6bd19
- 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.
62 lines
1.7 KiB
Nix
62 lines
1.7 KiB
Nix
{
|
|
pkgs,
|
|
inputs,
|
|
...
|
|
}: {
|
|
imports = [
|
|
inputs.niri.nixosModules.niri
|
|
(import ./niri/waybar.nix)
|
|
(import ./niri/swayidle.nix)
|
|
(import ./niri/fuzzel.nix)
|
|
(import ./niri/swaylock.nix)
|
|
];
|
|
|
|
programs.niri.enable = true;
|
|
|
|
# Enable UWSM (Universal Wayland Session Manager) for better session management
|
|
# See docs/uwsm-niri-integration.md for usage and migration guide
|
|
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";
|
|
};
|
|
};
|
|
};
|
|
|
|
# UWSM provides better environment variable inheritance and systemd integration
|
|
# All startup applications are now managed via systemd.user.services with
|
|
# WantedBy=["graphical-session.target"] in the home-manager configuration
|
|
|
|
# Use KDE portal instead of GNOME for better KDE integration
|
|
xdg.portal = {
|
|
enable = true;
|
|
extraPortals = with pkgs; [
|
|
kdePackages.xdg-desktop-portal-kde
|
|
];
|
|
config.common.default = "kde";
|
|
};
|
|
|
|
# Use KDE polkit for authentication instead of GNOME
|
|
security.polkit.enable = true;
|
|
systemd = {
|
|
user.services.polkit-kde-authentication-agent-1 = {
|
|
description = "polkit-kde-authentication-agent-1";
|
|
wantedBy = ["graphical-session.target"];
|
|
wants = ["graphical-session.target"];
|
|
after = ["graphical-session.target"];
|
|
serviceConfig = {
|
|
Type = "simple";
|
|
ExecStart = "${pkgs.kdePackages.polkit-kde-agent-1}/libexec/polkit-kde-authentication-agent-1";
|
|
Restart = "on-failure";
|
|
RestartSec = 1;
|
|
TimeoutStopSec = 10;
|
|
};
|
|
};
|
|
};
|
|
|
|
environment.sessionVariables.NIXOS_OZONE_WL = "1";
|
|
}
|