From 5bf42a8bc146aa3770c5e8c292bf3cc43d2c8dc9 Mon Sep 17 00:00:00 2001 From: Alexander Tomokhov Date: Wed, 27 Dec 2023 14:00:33 +0400 Subject: [PATCH] nixos: /etc/nixos#sp-nixos => /etc/nixos#default --- nixos/module.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/module.nix b/nixos/module.nix index 87b392e..38089fa 100644 --- a/nixos/module.nix +++ b/nixos/module.nix @@ -2,6 +2,7 @@ selfprivacy-graphql-api: { config, lib, pkgs, ... }: let cfg = config.services.selfprivacy-api; + config-id = "default"; nixos-rebuild = "${config.system.build.nixos-rebuild}/bin/nixos-rebuild"; in { @@ -104,7 +105,7 @@ in # (https://github.com/NixOS/nix/issues/9339) nix flake lock /etc/nixos --update-input sp-modules - ${nixos-rebuild} switch --flake /etc/nixos#sp-nixos + ${nixos-rebuild} switch --flake /etc/nixos#${config-id} ''; }; # One shot systemd service to upgrade NixOS using nixos-rebuild @@ -129,7 +130,7 @@ in nix flake update /etc/nixos \ --override-input selfprivacy-nixos-config git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git?ref=flakes - ${nixos-rebuild} switch --flake /etc/nixos#sp-nixos + ${nixos-rebuild} switch --flake /etc/nixos#${config-id} ''; }; # One shot systemd service to rollback NixOS using nixos-rebuild @@ -145,7 +146,7 @@ in serviceConfig = { User = "root"; ExecStart = - "${nixos-rebuild} switch --rollback --flake /etc/nixos#sp-nixos"; + "${nixos-rebuild} switch --rollback --flake /etc/nixos#${config-id}"; KillMode = "none"; SendSIGKILL = "no"; };