colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

users: services: remove no-longer-needed Restart and RestartSec options

Browse Source
This commit is contained in:
Colin 2024-03-21 04:43:22 +00:00
parent 384bc9e816
commit 9afd9725d1
29 changed files with 2 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hosts/common/programs/abaddon.nix
View File

@ -91,8 +91,6 @@ in
serviceConfig = {
ExecStart = "${cfg.package}/bin/abaddon";
Type = "simple";
Restart = "always";
RestartSec = "20s";
};
};
};

6
hosts/common/programs/bonsai.nix
View File

@ -125,11 +125,7 @@ in
${pkgs.coreutils}/bin/rm -f $XDG_RUNTIME_DIR/bonsai
exec ${cfg.package}/bin/bonsaid -t ${cfg.config.configFile}
'';
serviceConfig = {
Type = "simple";
Restart = "always";
RestartSec = "5s";
};
serviceConfig.Type = "simple";
};
};
}

2
hosts/common/programs/calls.nix
View File

@ -49,8 +49,6 @@ in
# add --verbose for more debugging
ExecStart = "env G_MESSAGES_DEBUG=all ${cfg.package}/bin/gnome-calls --daemon";
Type = "simple";
Restart = "always";
RestartSec = "10s";
};
};
};

2
hosts/common/programs/conky/default.nix
View File

@ -32,8 +32,6 @@
serviceConfig.ExecStart = "${config.sane.programs.conky.package}/bin/conky";
serviceConfig.Type = "simple";
serviceConfig.Restart = "on-failure";
serviceConfig.RestartSec = "10s";
};
};
}

2
hosts/common/programs/dconf.nix
View File

@ -40,8 +40,6 @@ in
serviceConfig = {
ExecStart = "${lib.getLib cfg.package}/libexec/dconf-service";
Type = "simple";
Restart = "always";
RestartSec = "5s";
};
};

2
hosts/common/programs/dino.nix
View File

@ -83,8 +83,6 @@ in
# env G_MESSAGES_DEBUG = "all";
ExecStart = "env PULSE_LATENCY_MSEC=20 ${cfg.package}/bin/dino";
Type = "simple";
Restart = "always";
RestartSec = "20s";
};
};
};

2
hosts/common/programs/dissent.nix
View File

@ -63,8 +63,6 @@ in
serviceConfig = {
ExecStart = "${cfg.package}/bin/dissent";
Type = "simple";
Restart = "always";
RestartSec = "20s";
};
};
};

2
hosts/common/programs/fcitx5.nix
View File

@ -106,8 +106,6 @@ in
serviceConfig = {
ExecStart="${cfg.package}/bin/fcitx5";
Type = "simple";
Restart = "always";
RestartSec = "10s";
};
};

2
hosts/common/programs/feedbackd.nix
View File

@ -107,8 +107,6 @@ in
"${cfg.package}/libexec/feedbackd"
]);
Type = "simple";
Restart = "on-failure";
RestartSec = "10s";
};
};
};

2
hosts/common/programs/fractal.nix
View File

@ -76,8 +76,6 @@ in
# env "G_MESSAGES_DEBUG=all"
ExecStart = "${cfg.package}/bin/fractal";
Type = "simple";
Restart = "always";
RestartSec = "20s";
};
};
};

2
hosts/common/programs/geary.nix
View File

@ -94,8 +94,6 @@ in
serviceConfig = {
ExecStart = "${cfg.package}/bin/geary";
Type = "simple";
Restart = "always";
RestartSec = "20s";
};
};
};

2
hosts/common/programs/gnome-keyring/default.nix
View File

@ -57,8 +57,6 @@ in
ExecStart = "${cfg.package}/bin/gnome-keyring-daemon --start --foreground --components=secrets";
ExecStartPre = "${pkgs.coreutils}/bin/mkdir -m 0700 -p %t/keyring";
Type = "simple";
Restart = "always";
RestartSec = "20s";
};
};
};

3
hosts/common/programs/mako.nix
View File

@ -57,9 +57,6 @@
serviceConfig.ExecStart = "${config.sane.programs.mako.package}/bin/mako";
serviceConfig.Type = "simple";
# mako will predictably fail if launched before the wayland server is fully initialized
serviceConfig.Restart = "on-failure";
serviceConfig.RestartSec = "10s";
};
};
}

6
hosts/common/programs/ntfy-sh.nix
View File

@ -32,11 +32,7 @@ in
topic=$(cat ~/.config/ntfy-sh/topic)
ntfy sub "https://ntfy.uninsane.org:2587/$topic"
'';
serviceConfig = {
Type = "simple";
Restart = "always";
RestartSec = "20s";
};
serviceConfig.Type = "simple";
};
};
}

4
hosts/common/programs/pipewire.nix
View File

@ -47,8 +47,6 @@ in
'';
ExecStopPost = ''rm -f "$XDG_RUNTIME_DIR/{pipewire-0,pipewire-0.lock,pipewire-0-manager,pipewire-0-manager.lock}"'';
Type = "simple";
Restart = "always";
RestartSec = "5s";
};
};
services.pipewire-pulse = {
@ -68,8 +66,6 @@ in
'';
ExecStopPost = ''rm -f "$XDG_RUNTIME_DIR/pulse/{native,pid}"'';
Type = "simple";
Restart = "always";
RestartSec = "5s";
};
};
};

2
hosts/common/programs/playerctl.nix
View File

@ -13,8 +13,6 @@
# serviceConfig.Type = "dbus";
# serviceConfig.BusName = "org.mpris.MediaPlayer2.Player";
serviceConfig.Type = "simple"; # playerctl also supports a --daemon option, idk if that's better
serviceConfig.Restart = "on-failure";
serviceConfig.RestartSec = "10s";
};
};
}

2
hosts/common/programs/sane-input-handler/default.nix
View File

@ -130,8 +130,6 @@ in
# serviceConfig = {
# ExecStart = "${config.sane.programs.actkbd.package}/bin/actkbd -c /home/colin/.config/actkbd/actkbd.conf";
# Type = "simple";
# Restart = "always";
# RestartSec = "5s";
# };
# };
# };

2
hosts/common/programs/signal-desktop.nix
View File

@ -54,8 +54,6 @@ in
# 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";
Type = "simple";
Restart = "always";
RestartSec = "20s";
};
};
};

2
hosts/common/programs/sway-autoscaler/default.nix
View File

@ -41,8 +41,6 @@ in
(builtins.toString cfg.config.interval)
];
Type = "simple";
Restart = "always";
RestartSec = "10s";
};
};
};

2
hosts/common/programs/swayidle.nix
View File

@ -73,8 +73,6 @@ in
)
);
Type = "simple";
Restart = "always";
RestartSec = "20s";
};
};
};

2
hosts/common/programs/swaynotificationcenter/default.nix
View File

@ -482,8 +482,6 @@ in
ExecStart = "env G_MESSAGES_DEBUG=all ${cfg.package}/bin/swaync";
Type = "simple";
# BusName = "org.freedesktop.Notifications";
Restart = "on-failure";
RestartSec = "10s";
};
};
};

2
hosts/common/programs/sysvol.nix
View File

@ -79,8 +79,6 @@ in
# -P to hide percentage text
ExecStart = "${cfg.package}/bin/sysvol -p 0 -t 1 -m 22 -H 39 -W 256 -i 32 -P";
Type = "simple";
Restart = "always";
RestartSec = "10s";
};
};
};

2
hosts/common/programs/waybar/default.nix
View File

@ -123,8 +123,6 @@ in
# env G_MESSAGES_DEBUG=all
ExecStart = "${cfg.package}/bin/waybar";
Type = "simple";
Restart = "on-failure";
RestartSec = "10s";
};
};
};

2
hosts/common/programs/wireplumber.nix
View File

@ -40,8 +40,6 @@ in
serviceConfig = {
ExecStart = "${cfg.package}/bin/wireplumber";
Type = "simple";
Restart = "always";
RestartSec = "5s";
};
};
};

2
hosts/common/programs/wvkbd.nix
View File

@ -48,8 +48,6 @@ in
"--hidden"
];
Type = "simple";
Restart = "always";
RestartSec = "3s";
};
};
};

2
hosts/common/programs/xdg-desktop-portal-gtk.nix
View File

@ -49,8 +49,6 @@ in
ExecStart="${cfg.package}/libexec/xdg-desktop-portal-gtk";
Type = "dbus";
BusName = "org.freedesktop.impl.portal.desktop.gtk";
Restart = "always";
RestartSec = "10s";
};
};
};

2
hosts/common/programs/xdg-desktop-portal-wlr.nix
View File

@ -34,8 +34,6 @@ in
ExecStart="${cfg.package}/libexec/xdg-desktop-portal-wlr";
Type = "dbus";
BusName = "org.freedesktop.impl.portal.desktop.wlr";
Restart = "always";
RestartSec = "10s";
};
};
};

4
hosts/common/programs/xdg-desktop-portal.nix
View File

@ -72,8 +72,6 @@ in
];
Type = "dbus";
BusName = "org.freedesktop.portal.Desktop";
Restart = "always";
RestartSec = "10s";
};
};
@ -93,8 +91,6 @@ in
];
Type = "dbus";
BusName = "org.freedesktop.impl.portal.PermissionStore";
Restart = "always";
RestartSec = "10s";
};
};
# also available: ${cfg.package}/libexec/xdg-document-portal

9
modules/users/default.nix
View File

@ -73,15 +73,6 @@ let
type = types.bool;
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 {
type = types.nullOr types.str;
default = null;