From 31d93e377072ef9746637a4c0a114ebc104ea305 Mon Sep 17 00:00:00 2001
From: Gabe Venberg <gabevenberg@gmail.com>
Date: Sun, 19 Oct 2025 00:26:13 +0200
Subject: [PATCH] fixed ipv6 on cirrus, fixed remote backups on cirrostratus.

---
 hosts/cirrostratus/default.nix |  1 -
 hosts/cirrostratus/nginx.nix   | 13 -------------
 hosts/cirrostratus/restic.nix  |  2 +-
 hosts/cirrus/default.nix       |  3 ++-
 justfile                       |  3 +++
 modules/nixos/restic.nix       |  7 +++++--
 6 files changed, 11 insertions(+), 18 deletions(-)
 delete mode 100644 hosts/cirrostratus/nginx.nix

diff --git a/hosts/cirrostratus/default.nix b/hosts/cirrostratus/default.nix
index a83ddc6..8cf6251 100644
--- a/hosts/cirrostratus/default.nix
+++ b/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
diff --git a/hosts/cirrostratus/nginx.nix b/hosts/cirrostratus/nginx.nix
deleted file mode 100644
index 08ba426..0000000
--- a/hosts/cirrostratus/nginx.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  inputs,
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
-  imports = [
-    ../../configs/nixos/nginx.nix
-  ];
-  #Restic submits some huge requests sometimes.
-  services.nginx.clientMaxBodySize = "1000m";
-}
diff --git a/hosts/cirrostratus/restic.nix b/hosts/cirrostratus/restic.nix
index 06e7ef1..577f5e7 100644
--- a/hosts/cirrostratus/restic.nix
+++ b/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;
diff --git a/hosts/cirrus/default.nix b/hosts/cirrus/default.nix
index 4986a02..f33d849 100644
--- a/hosts/cirrus/default.nix
+++ b/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"];
diff --git a/justfile b/justfile
index ba9a1cf..65c2189 100644
--- a/justfile
+++ b/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
diff --git a/modules/nixos/restic.nix b/modules/nixos/restic.nix
index b1f0c95..9490988 100644
--- a/modules/nixos/restic.nix
+++ b/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";
         };
       })
       (