fixed ipv6 on cirrus, fixed remote backups on cirrostratus.

hosts/cirrostratus/default.nix

@@ -15,7 +15,6 @@ inputs.nixpkgs.lib.nixosSystem {
     ./disk-config.nix
     ./hardware-configuration.nix
     ./restic.nix
-    ./nginx.nix
     ./copyparty.nix
     ./torrent.nix
     ../../configs/nixos/common.nix

hosts/cirrostratus/nginx.nix

@@ -1,13 +0,0 @@
-{
-  inputs,
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
-  imports = [
-    ../../configs/nixos/nginx.nix
-  ];
-  #Restic submits some huge requests sometimes.
-  services.nginx.clientMaxBodySize = "1000m";
-}

hosts/cirrostratus/restic.nix

@@ -25,7 +25,7 @@ in {
 
   host.restic = {
     enable = true;
-    repository = "/backup/restic/";
+    repository = config.sops.secrets.restic-url.path;
     passwordFile = config.sops.secrets.restic-password.path;
     server = {
       enable = true;

hosts/cirrus/default.nix

@@ -40,7 +40,8 @@ inputs.nixpkgs.lib.nixosSystem {
       networking.useNetworkd = true;
       systemd.network = {
         enable = true;
-        networks."enp1s0" = {
+        networks."10-enp1s0" = {
+          name = "enp1s0";
           networkConfig.DHCP = "ipv4";
           gateway = ["fe80::1"];
           address = ["2a01:4f8:1c1b:6c7c::1/64"];

justfile

@@ -9,6 +9,9 @@ home-manager target=(`whoami`+"@"+`hostname`):
     git add -AN
     home-manager --flake .#{{target}} switch
 
+deploy target:
+    nixos-rebuild --flake .#{{target}} switch --target-host root@{{target}}
+
 check:
     git add -AN
     nix flake check --keep-going

modules/nixos/restic.nix

@@ -100,7 +100,8 @@
       htpasswd-file = cfg.server.htpasswdPath;
     };
 
-    services.nginx.virtualHosts =
+    #Restic submits some huge requests sometimes.
+    services.nginx =
       lib.mkIf (
         cfg.server.enable
         && (lib.asserts.assertMsg
@@ -108,7 +109,8 @@
           "NGINX must be enabled")
       )
       {
-        "${cfg.server.domain}" = {
+        clientMaxBodySize = "1000m";
+        virtualHosts."${cfg.server.domain}" = {
           enableACME = lib.asserts.assertMsg (
             config.security.acme.acceptTerms
             == true
@@ -131,6 +133,7 @@
           paths = null;
           timerConfig = timer;
           pruneOpts = pruneOpts;
+          user = "restic";
         };
       })
       (