25 changed files with 24 additions and 3 deletions
--- a/configuration/desktop/printing.nix
+++ b/configuration/desktop/printing.nix
@ -3,5 +3,5 @@
 {
  services.printing.enable = true;
  services.avahi.enable = true;
-  services.avahi.nssmdns4 = true;
+  services.avahi.nssmdns = true;
 }
--- a/hosts/aluminium/configuration.nix
+++ b/hosts/aluminium/configuration.nix
@ -11,6 +11,7 @@
  boot.kernelParams = [ "console=ttyS0,115200n8" ];

  boot.loader.grub.enable = true;
+  boot.loader.grub.version = 2;
  boot.loader.grub.device = "/dev/sda";
  boot.loader.grub.extraConfig = "
    serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1
--- a/hosts/astatine/configuration.nix
+++ b/hosts/astatine/configuration.nix
@ -14,6 +14,7 @@

  # Use the GRUB 2 boot loader.
  boot.loader.grub.enable = true;
+  boot.loader.grub.version = 2;
  # boot.loader.grub.efiSupport = true;
  # boot.loader.grub.efiInstallAsRemovable = true;
  # boot.loader.efi.efiSysMountPoint = "/boot/efi";
--- a/hosts/backup-4/configuration.nix
+++ b/hosts/backup-4/configuration.nix
@ -11,6 +11,7 @@
    ];

  boot.loader.grub.enable = true;
+  boot.loader.grub.version = 2;
  boot.loader.grub.device = "/dev/vda";

  networking.hostName = "backup-4";
--- a/hosts/beryllium/configuration.nix
+++ b/hosts/beryllium/configuration.nix
@ -9,6 +9,7 @@
  boot.kernelParams = [ "console=ttyS0,115200n8" ];

  boot.loader.grub.enable = true;
+  boot.loader.grub.version = 2;
  boot.loader.grub.device = "/dev/sda";
  boot.loader.grub.extraConfig = "
    serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1
--- a/hosts/carbon/configuration.nix
+++ b/hosts/carbon/configuration.nix
@ -10,6 +10,7 @@
  boot.kernelParams = [ "console=ttyS0,115200n8" ];

  boot.loader.grub.enable = true;
+  boot.loader.grub.version = 2;
  boot.loader.grub.device = "/dev/sda";
  boot.loader.grub.extraConfig = "
    serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1
--- a/hosts/clerie-backup/configuration.nix
+++ b/hosts/clerie-backup/configuration.nix
@ -10,6 +10,7 @@
    ];

  boot.loader.grub.enable = true;
+  boot.loader.grub.version = 2;
  boot.loader.grub.device = "/dev/vda";

  boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
--- a/hosts/dn42-il-gw1/configuration.nix
+++ b/hosts/dn42-il-gw1/configuration.nix
@ -9,6 +9,7 @@
    ];

  boot.loader.grub.enable = true;
+  boot.loader.grub.version = 2;
  boot.loader.grub.device = "/dev/vda";

  networking.hostName = "dn42-il-gw1";
--- a/hosts/dn42-il-gw5/configuration.nix
+++ b/hosts/dn42-il-gw5/configuration.nix
@ -9,6 +9,7 @@
    ];

  boot.loader.grub.enable = true;
+  boot.loader.grub.version = 2;
  boot.loader.grub.device = "/dev/vda";

  networking.hostName = "dn42-il-gw5";
--- a/hosts/dn42-il-gw6/configuration.nix
+++ b/hosts/dn42-il-gw6/configuration.nix
@ -9,6 +9,7 @@
    ];

  boot.loader.grub.enable = true;
+  boot.loader.grub.version = 2;
  boot.loader.grub.device = "/dev/vda";

  networking.hostName = "dn42-il-gw6";
--- a/hosts/dn42-ildix-clerie/configuration.nix
+++ b/hosts/dn42-ildix-clerie/configuration.nix
@ -8,6 +8,7 @@
    ];

  boot.loader.grub.enable = true;
+  boot.loader.grub.version = 2;
  boot.loader.grub.device = "/dev/vda";

  networking.hostName = "dn42-ildix-clerie";
--- a/hosts/dn42-ildix-service/configuration.nix
+++ b/hosts/dn42-ildix-service/configuration.nix
@ -11,6 +11,7 @@

  # Use the GRUB 2 boot loader.
  boot.loader.grub.enable = true;
+  boot.loader.grub.version = 2;
  # boot.loader.grub.efiSupport = true;
  # boot.loader.grub.efiInstallAsRemovable = true;
  # boot.loader.efi.efiSysMountPoint = "/boot/efi";
--- a/hosts/gatekeeper/configuration.nix
+++ b/hosts/gatekeeper/configuration.nix
@ -8,6 +8,7 @@
    ];

  boot.loader.grub.enable = true;
+  boot.loader.grub.version = 2;
  boot.loader.grub.device = "/dev/sda";

  networking.hostName = "gatekeeper";
--- a/hosts/hydra-1/configuration.nix
+++ b/hosts/hydra-1/configuration.nix
@ -8,6 +8,7 @@
    ];

  boot.loader.grub.enable = true;
+  boot.loader.grub.version = 2;
  boot.loader.grub.device = "/dev/vda";
  
  boot.binfmt.emulatedSystems = [
--- a/hosts/hydra-2/configuration.nix
+++ b/hosts/hydra-2/configuration.nix
@ -8,6 +8,7 @@
    ];

  boot.loader.grub.enable = true;
+  boot.loader.grub.version = 2;
  boot.loader.grub.device = "/dev/vda";

  boot.binfmt.emulatedSystems = [
--- a/hosts/mail-2/configuration.nix
+++ b/hosts/mail-2/configuration.nix
@ -10,6 +10,7 @@
    ];

  boot.loader.grub.enable = true;
+  boot.loader.grub.version = 2;
  boot.loader.grub.device = "/dev/sda";

  networking.hostName = "mail-2";
--- a/hosts/minecraft-2/configuration.nix
+++ b/hosts/minecraft-2/configuration.nix
@ -15,6 +15,7 @@ in {
    ];

  boot.loader.grub.enable = true;
+  boot.loader.grub.version = 2;
  boot.loader.grub.device = "/dev/sda";

  networking.hostName = "minecraft-2";
--- a/hosts/monitoring-3/configuration.nix
+++ b/hosts/monitoring-3/configuration.nix
@ -14,6 +14,7 @@
    ];

  boot.loader.grub.enable = true;
+  boot.loader.grub.version = 2;
  boot.loader.grub.device = "/dev/sda";

  networking.hostName = "monitoring-3";
--- a/hosts/nonat/configuration.nix
+++ b/hosts/nonat/configuration.nix
@ -9,6 +9,7 @@
    ];

  boot.loader.grub.enable = true;
+  boot.loader.grub.version = 2;
  boot.loader.grub.device = "/dev/vda";

  networking.hostName = "nonat";
--- a/hosts/osmium/configuration.nix
+++ b/hosts/osmium/configuration.nix
@ -11,6 +11,7 @@
    ];

  boot.loader.grub.enable = true;
+  boot.loader.grub.version = 2;
  boot.loader.grub.device = "/dev/vda";

  boot.binfmt.emulatedSystems = [
--- a/hosts/porter/configuration.nix
+++ b/hosts/porter/configuration.nix
@ -8,6 +8,7 @@
    ];

  boot.loader.grub.enable = true;
+  boot.loader.grub.version = 2;
  boot.loader.grub.device = "/dev/sda";

  networking.hostName = "porter";
--- a/hosts/storage-2/configuration.nix
+++ b/hosts/storage-2/configuration.nix
@ -12,6 +12,7 @@
    ];

  boot.loader.grub.enable = true;
+  boot.loader.grub.version = 2;
  boot.loader.grub.device = "/dev/vda";

  networking.hostName = "storage-2";
--- a/hosts/web-2/configuration.nix
+++ b/hosts/web-2/configuration.nix
@ -29,6 +29,7 @@
    ];

  boot.loader.grub.enable = true;
+  boot.loader.grub.version = 2;
  boot.loader.grub.device = "/dev/sda";

  networking.hostName = "web-2";
--- a/modules/backup/default.nix
+++ b/modules/backup/default.nix
@ -29,7 +29,6 @@ let
  in
    nameValuePair "clerie-backup-${jobName}-${targetName}" {
      requires = [ "network.target" "local-fs.target" ];
-      after = [ "network.target" "local-fs.target" ];
      path = [ pkgs.restic ];

      serviceConfig = {
@ -64,7 +63,6 @@ let
        OnCalendar = "hourly";
        RandomizedDelaySec = "1h";
      };
-      requires = [ "network-online.target" ];
      after = [ "network-online.target" ];
    }
  ) jobTargetPairs);
--- a/modules/clerie-gc-dir/default.nix
+++ b/modules/clerie-gc-dir/default.nix
@ -26,6 +26,7 @@ let
        OnCalendar = "hourly";
        RandomizedDelaySec = "1h";
      };
+      after = [ "network-online.target" ];
    }
  ) cfg.dirs;