users: services: remove no-longer-needed Restart
and RestartSec
options
This commit is contained in:
parent
384bc9e816
commit
9afd9725d1
|
@ -91,8 +91,6 @@ in
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
ExecStart = "${cfg.package}/bin/abaddon";
|
ExecStart = "${cfg.package}/bin/abaddon";
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
Restart = "always";
|
|
||||||
RestartSec = "20s";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -125,11 +125,7 @@ in
|
||||||
${pkgs.coreutils}/bin/rm -f $XDG_RUNTIME_DIR/bonsai
|
${pkgs.coreutils}/bin/rm -f $XDG_RUNTIME_DIR/bonsai
|
||||||
exec ${cfg.package}/bin/bonsaid -t ${cfg.config.configFile}
|
exec ${cfg.package}/bin/bonsaid -t ${cfg.config.configFile}
|
||||||
'';
|
'';
|
||||||
serviceConfig = {
|
serviceConfig.Type = "simple";
|
||||||
Type = "simple";
|
|
||||||
Restart = "always";
|
|
||||||
RestartSec = "5s";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -49,8 +49,6 @@ in
|
||||||
# add --verbose for more debugging
|
# add --verbose for more debugging
|
||||||
ExecStart = "env G_MESSAGES_DEBUG=all ${cfg.package}/bin/gnome-calls --daemon";
|
ExecStart = "env G_MESSAGES_DEBUG=all ${cfg.package}/bin/gnome-calls --daemon";
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
Restart = "always";
|
|
||||||
RestartSec = "10s";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -32,8 +32,6 @@
|
||||||
|
|
||||||
serviceConfig.ExecStart = "${config.sane.programs.conky.package}/bin/conky";
|
serviceConfig.ExecStart = "${config.sane.programs.conky.package}/bin/conky";
|
||||||
serviceConfig.Type = "simple";
|
serviceConfig.Type = "simple";
|
||||||
serviceConfig.Restart = "on-failure";
|
|
||||||
serviceConfig.RestartSec = "10s";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,8 +40,6 @@ in
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
ExecStart = "${lib.getLib cfg.package}/libexec/dconf-service";
|
ExecStart = "${lib.getLib cfg.package}/libexec/dconf-service";
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
Restart = "always";
|
|
||||||
RestartSec = "5s";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -83,8 +83,6 @@ in
|
||||||
# env G_MESSAGES_DEBUG = "all";
|
# env G_MESSAGES_DEBUG = "all";
|
||||||
ExecStart = "env PULSE_LATENCY_MSEC=20 ${cfg.package}/bin/dino";
|
ExecStart = "env PULSE_LATENCY_MSEC=20 ${cfg.package}/bin/dino";
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
Restart = "always";
|
|
||||||
RestartSec = "20s";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -63,8 +63,6 @@ in
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
ExecStart = "${cfg.package}/bin/dissent";
|
ExecStart = "${cfg.package}/bin/dissent";
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
Restart = "always";
|
|
||||||
RestartSec = "20s";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -106,8 +106,6 @@ in
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
ExecStart="${cfg.package}/bin/fcitx5";
|
ExecStart="${cfg.package}/bin/fcitx5";
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
Restart = "always";
|
|
||||||
RestartSec = "10s";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -107,8 +107,6 @@ in
|
||||||
"${cfg.package}/libexec/feedbackd"
|
"${cfg.package}/libexec/feedbackd"
|
||||||
]);
|
]);
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
Restart = "on-failure";
|
|
||||||
RestartSec = "10s";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -76,8 +76,6 @@ in
|
||||||
# env "G_MESSAGES_DEBUG=all"
|
# env "G_MESSAGES_DEBUG=all"
|
||||||
ExecStart = "${cfg.package}/bin/fractal";
|
ExecStart = "${cfg.package}/bin/fractal";
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
Restart = "always";
|
|
||||||
RestartSec = "20s";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -94,8 +94,6 @@ in
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
ExecStart = "${cfg.package}/bin/geary";
|
ExecStart = "${cfg.package}/bin/geary";
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
Restart = "always";
|
|
||||||
RestartSec = "20s";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -57,8 +57,6 @@ in
|
||||||
ExecStart = "${cfg.package}/bin/gnome-keyring-daemon --start --foreground --components=secrets";
|
ExecStart = "${cfg.package}/bin/gnome-keyring-daemon --start --foreground --components=secrets";
|
||||||
ExecStartPre = "${pkgs.coreutils}/bin/mkdir -m 0700 -p %t/keyring";
|
ExecStartPre = "${pkgs.coreutils}/bin/mkdir -m 0700 -p %t/keyring";
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
Restart = "always";
|
|
||||||
RestartSec = "20s";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -57,9 +57,6 @@
|
||||||
|
|
||||||
serviceConfig.ExecStart = "${config.sane.programs.mako.package}/bin/mako";
|
serviceConfig.ExecStart = "${config.sane.programs.mako.package}/bin/mako";
|
||||||
serviceConfig.Type = "simple";
|
serviceConfig.Type = "simple";
|
||||||
# mako will predictably fail if launched before the wayland server is fully initialized
|
|
||||||
serviceConfig.Restart = "on-failure";
|
|
||||||
serviceConfig.RestartSec = "10s";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,11 +32,7 @@ in
|
||||||
topic=$(cat ~/.config/ntfy-sh/topic)
|
topic=$(cat ~/.config/ntfy-sh/topic)
|
||||||
ntfy sub "https://ntfy.uninsane.org:2587/$topic"
|
ntfy sub "https://ntfy.uninsane.org:2587/$topic"
|
||||||
'';
|
'';
|
||||||
serviceConfig = {
|
serviceConfig.Type = "simple";
|
||||||
Type = "simple";
|
|
||||||
Restart = "always";
|
|
||||||
RestartSec = "20s";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,8 +47,6 @@ in
|
||||||
'';
|
'';
|
||||||
ExecStopPost = ''rm -f "$XDG_RUNTIME_DIR/{pipewire-0,pipewire-0.lock,pipewire-0-manager,pipewire-0-manager.lock}"'';
|
ExecStopPost = ''rm -f "$XDG_RUNTIME_DIR/{pipewire-0,pipewire-0.lock,pipewire-0-manager,pipewire-0-manager.lock}"'';
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
Restart = "always";
|
|
||||||
RestartSec = "5s";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
services.pipewire-pulse = {
|
services.pipewire-pulse = {
|
||||||
|
@ -68,8 +66,6 @@ in
|
||||||
'';
|
'';
|
||||||
ExecStopPost = ''rm -f "$XDG_RUNTIME_DIR/pulse/{native,pid}"'';
|
ExecStopPost = ''rm -f "$XDG_RUNTIME_DIR/pulse/{native,pid}"'';
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
Restart = "always";
|
|
||||||
RestartSec = "5s";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -13,8 +13,6 @@
|
||||||
# serviceConfig.Type = "dbus";
|
# serviceConfig.Type = "dbus";
|
||||||
# serviceConfig.BusName = "org.mpris.MediaPlayer2.Player";
|
# serviceConfig.BusName = "org.mpris.MediaPlayer2.Player";
|
||||||
serviceConfig.Type = "simple"; # playerctl also supports a --daemon option, idk if that's better
|
serviceConfig.Type = "simple"; # playerctl also supports a --daemon option, idk if that's better
|
||||||
serviceConfig.Restart = "on-failure";
|
|
||||||
serviceConfig.RestartSec = "10s";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -130,8 +130,6 @@ in
|
||||||
# serviceConfig = {
|
# serviceConfig = {
|
||||||
# ExecStart = "${config.sane.programs.actkbd.package}/bin/actkbd -c /home/colin/.config/actkbd/actkbd.conf";
|
# ExecStart = "${config.sane.programs.actkbd.package}/bin/actkbd -c /home/colin/.config/actkbd/actkbd.conf";
|
||||||
# Type = "simple";
|
# Type = "simple";
|
||||||
# Restart = "always";
|
|
||||||
# RestartSec = "5s";
|
|
||||||
# };
|
# };
|
||||||
# };
|
# };
|
||||||
# };
|
# };
|
||||||
|
|
|
@ -54,8 +54,6 @@ in
|
||||||
# for some reason the --ozone-platform-hint=auto flag fails when signal-desktop is launched from a service
|
# for some reason the --ozone-platform-hint=auto flag fails when signal-desktop is launched from a service
|
||||||
ExecStart = "env NIXOS_OZONE_WL=1 ${cfg.package}/bin/signal-desktop";
|
ExecStart = "env NIXOS_OZONE_WL=1 ${cfg.package}/bin/signal-desktop";
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
Restart = "always";
|
|
||||||
RestartSec = "20s";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -41,8 +41,6 @@ in
|
||||||
(builtins.toString cfg.config.interval)
|
(builtins.toString cfg.config.interval)
|
||||||
];
|
];
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
Restart = "always";
|
|
||||||
RestartSec = "10s";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -73,8 +73,6 @@ in
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
Restart = "always";
|
|
||||||
RestartSec = "20s";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -482,8 +482,6 @@ in
|
||||||
ExecStart = "env G_MESSAGES_DEBUG=all ${cfg.package}/bin/swaync";
|
ExecStart = "env G_MESSAGES_DEBUG=all ${cfg.package}/bin/swaync";
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
# BusName = "org.freedesktop.Notifications";
|
# BusName = "org.freedesktop.Notifications";
|
||||||
Restart = "on-failure";
|
|
||||||
RestartSec = "10s";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -79,8 +79,6 @@ in
|
||||||
# -P to hide percentage text
|
# -P to hide percentage text
|
||||||
ExecStart = "${cfg.package}/bin/sysvol -p 0 -t 1 -m 22 -H 39 -W 256 -i 32 -P";
|
ExecStart = "${cfg.package}/bin/sysvol -p 0 -t 1 -m 22 -H 39 -W 256 -i 32 -P";
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
Restart = "always";
|
|
||||||
RestartSec = "10s";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -123,8 +123,6 @@ in
|
||||||
# env G_MESSAGES_DEBUG=all
|
# env G_MESSAGES_DEBUG=all
|
||||||
ExecStart = "${cfg.package}/bin/waybar";
|
ExecStart = "${cfg.package}/bin/waybar";
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
Restart = "on-failure";
|
|
||||||
RestartSec = "10s";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -40,8 +40,6 @@ in
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
ExecStart = "${cfg.package}/bin/wireplumber";
|
ExecStart = "${cfg.package}/bin/wireplumber";
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
Restart = "always";
|
|
||||||
RestartSec = "5s";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -48,8 +48,6 @@ in
|
||||||
"--hidden"
|
"--hidden"
|
||||||
];
|
];
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
Restart = "always";
|
|
||||||
RestartSec = "3s";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -49,8 +49,6 @@ in
|
||||||
ExecStart="${cfg.package}/libexec/xdg-desktop-portal-gtk";
|
ExecStart="${cfg.package}/libexec/xdg-desktop-portal-gtk";
|
||||||
Type = "dbus";
|
Type = "dbus";
|
||||||
BusName = "org.freedesktop.impl.portal.desktop.gtk";
|
BusName = "org.freedesktop.impl.portal.desktop.gtk";
|
||||||
Restart = "always";
|
|
||||||
RestartSec = "10s";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -34,8 +34,6 @@ in
|
||||||
ExecStart="${cfg.package}/libexec/xdg-desktop-portal-wlr";
|
ExecStart="${cfg.package}/libexec/xdg-desktop-portal-wlr";
|
||||||
Type = "dbus";
|
Type = "dbus";
|
||||||
BusName = "org.freedesktop.impl.portal.desktop.wlr";
|
BusName = "org.freedesktop.impl.portal.desktop.wlr";
|
||||||
Restart = "always";
|
|
||||||
RestartSec = "10s";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -72,8 +72,6 @@ in
|
||||||
];
|
];
|
||||||
Type = "dbus";
|
Type = "dbus";
|
||||||
BusName = "org.freedesktop.portal.Desktop";
|
BusName = "org.freedesktop.portal.Desktop";
|
||||||
Restart = "always";
|
|
||||||
RestartSec = "10s";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -93,8 +91,6 @@ in
|
||||||
];
|
];
|
||||||
Type = "dbus";
|
Type = "dbus";
|
||||||
BusName = "org.freedesktop.impl.portal.PermissionStore";
|
BusName = "org.freedesktop.impl.portal.PermissionStore";
|
||||||
Restart = "always";
|
|
||||||
RestartSec = "10s";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
# also available: ${cfg.package}/libexec/xdg-document-portal
|
# also available: ${cfg.package}/libexec/xdg-document-portal
|
||||||
|
|
|
@ -73,15 +73,6 @@ let
|
||||||
type = types.bool;
|
type = types.bool;
|
||||||
default = false;
|
default = false;
|
||||||
};
|
};
|
||||||
serviceConfig.Restart = mkOption {
|
|
||||||
type = types.nullOr (types.enum [ "always" "on-failure" ]);
|
|
||||||
default = null;
|
|
||||||
# N.B.: systemd doesn't allow always/on-failure for Type="oneshot" services
|
|
||||||
};
|
|
||||||
serviceConfig.RestartSec = mkOption {
|
|
||||||
type = types.str;
|
|
||||||
default = "20s";
|
|
||||||
};
|
|
||||||
unitConfig.ConditionEnvironment = mkOption {
|
unitConfig.ConditionEnvironment = mkOption {
|
||||||
type = types.nullOr types.str;
|
type = types.nullOr types.str;
|
||||||
default = null;
|
default = null;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user