maralorn/nixos-config
1
0
Fork 0
Code Wiki Activity

Improve update-timer

Browse source
This commit is contained in:
Malte Brandy 2019-08-02 19:04:31 +02:00
parent 2a2c5369bb
commit 35c73a4f8f
4 changed files with 52 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
system/server/default.nix
View file

@ -1,30 +1,7 @@
{ config, pkgs, lib, ... }:
let user = "maralorn";
in {
{ config, pkgs, lib, ... }: {
imports = [ ./init_ssh.nix ];
systemd.services.test-and-update = {
startAt = "2:45";
environment.NIX_PATH =
"/etc/nix-path:nixos-config=/etc/nixos/configuration.nix";
path = [ pkgs.nix pkgs.gnutar pkgs.gzip pkgs.git pkgs.git-crypt ];
restartIfChanged = false;
unitConfig.X-StopOnRemoval = false;
serviceConfig = {
Type = "oneshot";
WorkingDirectory = "/var/cache/gc-links";
};
script = ''
${(import ../../lib/test.nix).test-config}/bin/test-config
/run/wrappers/bin/sudo -u ${user} git -C /etc/nixos pull
${
(import ../../lib/update-system.nix
config.system.build.nixos-rebuild).update-system
}/bin/update-system
/run/wrappers/bin/sudo -u ${user} update-home
'';
};
nix = {
gc.automatic = true;
optimise.automatic = true;

33
system/test-timer.nix
View file

@ -1,5 +1,33 @@
{ pkgs, config, lib, ... }: {
systemd.services."test-and-bump-config" = {
{ pkgs, config, lib, ... }:
let
user = "maralorn";
inherit (import ../lib/test.nix) test-config;
inherit (import ../lib/update-system.nix config.system.build.nixos-rebuild)
update-system;
update-home = (import ../lib/update-home.nix).update-home "/etc/nixos";
in {
systemd.services = {
test-and-update = {
startAt = "2:45";
environment.NIX_PATH =
"/etc/nix-path:nixos-config=/etc/nixos/configuration.nix";
path = [ pkgs.nix pkgs.gnutar pkgs.gzip pkgs.git pkgs.git-crypt ];
restartIfChanged = false;
unitConfig.X-StopOnRemoval = false;
serviceConfig = {
Type = "oneshot";
WorkingDirectory = "/var/cache/gc-links";
};
script = ''
${test-config}/bin/test-config
/run/wrappers/bin/sudo -u ${user} git -C /etc/nixos pull
${update-system}/bin/update-system
/run/wrappers/bin/sudo -u ${user} ${update-home}/bin/update-home
'';
};
test-and-bump-config = {
startAt = "20:30";
path = [ pkgs.nix pkgs.gnutar pkgs.gzip pkgs.git pkgs.git-crypt ];
serviceConfig = {
@ -9,4 +37,5 @@
"${(import ../lib/test.nix).test-config}/bin/test-config bump";
};
};
};
}