From 8ccec537401b51583d89f59790953ad32534563a Mon Sep 17 00:00:00 2001 From: Alexander Tomokhov Date: Thu, 23 Nov 2023 11:36:02 +0400 Subject: [PATCH] module: more realistic commands in systemd services --- nixos/module.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/module.nix b/nixos/module.nix index 628e5c2..b08a678 100644 --- a/nixos/module.nix +++ b/nixos/module.nix @@ -111,10 +111,13 @@ in path = [ pkgs.coreutils pkgs.gnutar pkgs.xz.bin pkgs.gzip pkgs.gitMinimal config.nix.package.out pkgs.nixos-rebuild ]; serviceConfig = { User = "root"; - ExecStart = "${pkgs.nixos-rebuild}/bin/nixos-rebuild switch --flake /etc/nixos#sp-nixos"; KillMode = "none"; SendSIGKILL = "no"; }; + script = '' + ${config.nix.package}/bin/nix flake lock --update-input sp-modules" + ${pkgs.nixos-rebuild}/bin/nixos-rebuild switch --flake /etc/nixos#sp-nixos + ''; }; # One shot systemd service to upgrade NixOS using nixos-rebuild systemd.services.sp-nixos-upgrade = { @@ -129,7 +132,7 @@ in SendSIGKILL = "no"; }; script = '' - ${pkgs.nix}/bin/nix flake lock --override-input selfprivacy-nixos-config "git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git?ref=flakes" + ${config.nix.package}/bin/nix flake update --override-input selfprivacy-nixos-config "git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git?ref=flakes" ${pkgs.nixos-rebuild}/bin/nixos-rebuild switch --flake /etc/nixos#sp-nixos ''; };