This commit is contained in:
ari committed 2025-09-18 12:46:12 -04:00
1 parent 57d6c968d9
commit 9f6ffaab98
5 files changed
+55 -41

No files matched your search

+33 -29
View File
@@ -2,23 +2,27 @@
let
cfg = config.skyg.nixos.desktop.tiler.niri;
makeNiriSystemdService = { description, script, path ? [ ] }: {
Unit = {
Description = description;
After = [ "niri.service" "xdg-desktop-portal.service" ];
PartOf = [ "niri.service" "tray.target" ];
BindsTo = [ "niri.service" ];
Wants = [ "niri.service" "xdg-desktop-portal.service" ];
WantedBy = [
"graphical-session.target"
# "tray.target"
];
Requires = [ "niri.service" ];
};
Service = {
inherit description script path;
enable = true;
requires = [ "niri.service" ];
restartTriggers = [
script
path
];
reloadTriggers = [
script
path
];
after = [ "niri.service" "xdg-desktop-portal.service" ];
partOf = [ "niri.service" "tray.target" ];
bindsTo = [ "niri.service" ];
wants = [ "niri.service" "xdg-desktop-portal.service" ];
wantedBy = [ "graphical-session.target" "tray.target" ];
serviceConfig = {
Type = "simple";
KillMode = "mixed";
Restart = "on-failure";
ExecReload = "${pkgs.coreutils}/bin/kill -SIGUSR2 $MAINPID";
KillMode = "mixed";
ConditionEnvironment = "WAYLAND_DISPLAY";
};
};
@@ -46,31 +50,31 @@ in
filePath = "niri";
configSource = "/home/${config.skyg.user.name}/nixos-setup/configs";
};
users.users.${config.skyg.user.name}.systemd.user.services.niri-waybar = makeNiriSystemdService {
description = "Niri's Top Waybar";
path = [ pkgs.nwg-bar pkgs.niri ];
script = ''
${pkgs.waybar}/bin/waybar \
--config /home/${config.skyg.user.name}/nixos-setup/configs/niri/waybar/top-bar.jsonc \
--style /home/${config.skyg.user.name}/nixos-setup/configs/niri/waybar/top-bar.css &
${pkgs.waybar}/bin/waybar \
--config /home/${config.skyg.user.name}/nixos-setup/configs/niri/waybar/bottom-bar.jsonc \
--style /home/${config.skyg.user.name}/nixos-setup/configs/niri/waybar/bottom-bar.css
'';
};
users.users.${config.skyg.user.name}.systemd.user.services.niri-xwayland = makeNiriSystemdService {
# systemd.user.services.niri-waybar = makeNiriSystemdService {
# description = "Niri's Top Waybar";
# path = [ pkgs.nwg-bar pkgs.niri ];
# script = ''
# ${pkgs.waybar}/bin/waybar \
# --config /home/${config.skyg.user.name}/nixos-setup/configs/niri/waybar/top-bar.jsonc \
# --style /home/${config.skyg.user.name}/nixos-setup/configs/niri/waybar/top-bar.css &
# ${pkgs.waybar}/bin/waybar \
# --config /home/${config.skyg.user.name}/nixos-setup/configs/niri/waybar/bottom-bar.jsonc \
# --style /home/${config.skyg.user.name}/nixos-setup/configs/niri/waybar/bottom-bar.css
# '';
# };
systemd.user.services.niri-xwayland = makeNiriSystemdService {
description = "Niri's xwayland-satellite";
script = ''
${pkgs.xwayland-satellite}/bin/xwayland-satellite
'';
};
users.users.${config.skyg.user.name}.systemd.user.services.niri-hypridle = makeNiriSystemdService {
systemd.user.services.niri-hypridle = makeNiriSystemdService {
description = "Niri's hypridle";
script = ''
${pkgs.hypridle}/bin/hypridle
'';
};
users.users.${config.skyg.user.name}.systemd.user.services.niri-swayosd = makeNiriSystemdService {
systemd.user.services.niri-swayosd = makeNiriSystemdService {
description = "Niri's swayosd";
script = ''
${pkgs.swayosd}/bin/swayosd-server