unexplrd/nixos-blueprint
2
2
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

niri: redo a lot

Browse Source 
Signed-off-by: unexplrd <unexplrd@linerds.us>
This commit is contained in:
unexplrd
2025-07-19 13:19:54 +03:00
parent bba55dc973
commit c0d1341448
4 changed files with 424 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
modules/home/desktop/niri/default.nix
View File

@ -7,7 +7,7 @@
pkgs,
...
}: let
inherit (lib) mkIf mkEnableOption mkDefault mkForce getExe;
inherit (lib) mkIf mkEnableOption mkForce getExe;
inherit (osConfig.networking) hostName;
cfg = config.desktop.niri;
@ -131,7 +131,7 @@ in {
};
targets.tray.Unit.Description = "Home Manager System Tray"; # workaround for udiskie
services = let
mkGraphicalService = config: graphicalService // config;
mkGraphicalService = config: lib.attrsets.recursiveUpdate graphicalService config;
graphicalService = {
Install.WantedBy = ["niri.service"];
Unit = {
@ -148,33 +148,25 @@ in {
in
lib.mkMerge [
{
udiskie = mkGraphicalService {};
waybar = mkGraphicalService {};
copyq = mkGraphicalService {Service.Environment = mkForce "QT_QPA_PLATFORM=wayland";};
network-manager-applet = mkGraphicalService {};
copyq = mkGraphicalService {
Service =
graphicalService.Service
// {
Environment = mkForce "QT_QPA_PLATFORM=wayland";
};
};
xwayland-satellite = mkGraphicalService {
Service =
graphicalService.Service
// {
Type = "simple";
ExecStart = getExe pkgs.xwayland-satellite + " :123";
};
};
wpaperd = mkGraphicalService {
Service =
mkDefault graphicalService.Service;
};
udiskie = mkGraphicalService {};
walker = mkGraphicalService {};
waybar = mkGraphicalService {};
wpaperd =
mkGraphicalService {}
// {
Service.TimeoutStopSec = mkForce "1";
Service.Restart = mkForce "always";
};
xwayland-satellite = mkGraphicalService {
Service = {
Type = "simple";
ExecStart = getExe pkgs.xwayland-satellite + " :123";
};
};
# gnome-polkit-agent = mkGraphicalService {
# Service =
# graphicalService.Service
# // {
# Service = {
# Type = "simple";
# ExecStart = pkgs.polkit_gnome + "/libexec/polkit-gnome-authentication-agent-1";
# };
@ -182,20 +174,18 @@ in {
}
(lib.mkIf (hostName == "morphius") {
lisgd = mkGraphicalService {
Service =
graphicalService.Service
// {
# Group = "input";
Type = "simple";
ExecStart =
"${pkgs.lisgd}/bin/lisgd"
+ " -d /dev/input/by-path/pci-0000:00:15.1-platform-i2c_designware.1-event"
+ " -g \"1,DU,TL,*,P,niri msg action toggle-overview\""
+ " -g \"3,UD,T,*,P,niri msg action focus-workspace-up\""
+ " -g \"3,DU,B,*,P,niri msg action focus-workspace-down\""
+ " -g \"3,LR,L,*,P,niri msg action focus-column-left\""
+ " -g \"3,RL,R,*,P,niri msg action focus-column-right\"";
};
Service = {
# Group = "input";
Type = "simple";
ExecStart =
"${pkgs.lisgd}/bin/lisgd"
+ " -d /dev/input/by-path/pci-0000:00:15.1-platform-i2c_designware.1-event"
+ " -g \"1,DU,TL,*,P,niri msg action toggle-overview\""
+ " -g \"3,UD,T,*,P,niri msg action focus-workspace-up\""
+ " -g \"3,DU,B,*,P,niri msg action focus-workspace-down\""
+ " -g \"3,LR,L,*,P,niri msg action focus-column-left\""
+ " -g \"3,RL,R,*,P,niri msg action focus-column-right\"";
};
};
})
];