1
0

Update from master 2023-12-16T02:03+00:00

This commit is contained in:
Flake Update Bot 2023-12-16 03:03:02 +01:00
commit dbed794e8c
7 changed files with 24 additions and 8 deletions

View File

@ -4,6 +4,8 @@
clerie.nixfiles.enable = true;
clerie.nixfiles.system-auto-upgrade.enable = true;
nix.settings = {
trusted-users = [ "@wheel" "@guests" ];
auto-optimise-store = true;

View File

@ -10,7 +10,6 @@
colmena
vim
agenix
nixfiles-system-upgrade
];
programs.mtr.enable = true;

View File

@ -330,8 +330,8 @@
'';
clerie.nixfiles.system-auto-upgrade = {
enable = true;
allowReboot = true;
autoUpgrade = true;
};
clerie.monitoring = {

View File

@ -184,8 +184,9 @@
'';
clerie.nixfiles.system-auto-upgrade = {
enable = true;
allowReboot = true;
autoUpgrade = true;
startAt = "*-*-* 06:22:00";
};
clerie.monitoring = {

View File

@ -184,8 +184,9 @@
'';
clerie.nixfiles.system-auto-upgrade = {
enable = true;
allowReboot = true;
autoUpgrade = true;
startAt = "*-*-* 07:22:00";
};
clerie.monitoring = {

View File

@ -40,8 +40,8 @@
networking.firewall.allowedUDPPorts = [];
clerie.nixfiles.system-auto-upgrade = {
enable = true;
allowReboot = true;
autoUpgrade = true;
};
clerie.monitoring = {

View File

@ -15,6 +15,16 @@ in
default = false;
description = "Monitor NixOS";
};
autoUpgrade = mkOption {
type = types.bool;
default = false;
description = "Automatically check and install upgrades";
};
startAt = mkOption {
type = with types; nullOr string;
default = null;
description = "Systemd time string for starting the unit";
};
};
};
config = mkIf cfg.enable {
@ -28,13 +38,16 @@ in
ExecStart = pkgs.nixfiles-system-upgrade + "/bin/nixfiles-system-upgrade --no-confirm${optionalString cfg.allowReboot " --allow-reboot"}${optionalString (config.clerie.monitoring.enable) " --node-exporter-metrics-path /var/lib/prometheus-node-exporter/textfiles/nixfiles-system-upgrade.prom"}";
};
};
systemd.timers.nixfiles-system-auto-upgrade = {
systemd.timers.nixfiles-system-auto-upgrade = mkIf cfg.autoUpgrade {
wantedBy = [ "timers.target" ];
timerConfig = {
OnCalendar = "*-*-* 05:37:00";
RandomizedDelaySec = "2h";
OnCalendar = if cfg.startAt == null then "*-*-* 05:37:00" else cfg.startAt;
RandomizedDelaySec = if cfg.startAt == null then "2h" else "10m";
};
after = [ "network-online.target" ];
};
environment.systemPackages = with pkgs; [
nixfiles-system-upgrade
];
};
}