From c0a8f8116ebaf6b665b07467363439a19372c6e9 Mon Sep 17 00:00:00 2001 From: clerie <git@clerie.de> Date: Wed, 16 Apr 2025 21:05:01 +0200 Subject: [PATCH 1/3] hosts/nonat: Enable DHCPv6 to try out NTP --- hosts/nonat/configuration.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/hosts/nonat/configuration.nix b/hosts/nonat/configuration.nix index 5bddcb6..47d7495 100644 --- a/hosts/nonat/configuration.nix +++ b/hosts/nonat/configuration.nix @@ -23,7 +23,6 @@ { Gateway = "2001:638:904:ffca::1"; } ]; linkConfig.RequiredForOnline = "routable"; - ipv6AcceptRAConfig.DHCPv6Client = "no"; }; systemd.network.networks."10-nat-netz-mercury" = { matchConfig.Name = "ens19"; @@ -31,7 +30,6 @@ "192.168.10.1/24" ]; linkConfig.RequiredForOnline = "no"; - ipv6AcceptRAConfig.DHCPv6Client = "no"; }; networking.nat = { From fed00bd41b6218ff505f8a30d6e6576e052f02c0 Mon Sep 17 00:00:00 2001 From: clerie <git@clerie.de> Date: Wed, 16 Apr 2025 22:03:38 +0200 Subject: [PATCH 2/3] modules/backup: Specify backup server as full URL --- configuration/common/backup.nix | 4 ++-- modules/backup/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configuration/common/backup.nix b/configuration/common/backup.nix index 7cb500f..2cdf77a 100644 --- a/configuration/common/backup.nix +++ b/configuration/common/backup.nix @@ -4,8 +4,8 @@ clerie.backup = { targets = { - cyan.serverName = "cyan.backup.clerie.de"; - magenta.serverName = "magenta.backup.clerie.de"; + cyan.serverUrl = "https://cyan.backup.clerie.de"; + magenta.serverUrl = "https://magenta.backup.clerie.de"; }; }; diff --git a/modules/backup/default.nix b/modules/backup/default.nix index cea7ca9..9cc552d 100644 --- a/modules/backup/default.nix +++ b/modules/backup/default.nix @@ -64,7 +64,7 @@ let targetUsername = if targetOptions.username == null then config.networking.hostName else targetOptions.username; in { "clerie-backup/${jobName}-${targetName}/repo_password".source = jobPasswordFile; - "clerie-backup/${jobName}-${targetName}/repo_url".text = "https://${targetOptions.serverName}${repoPath}"; + "clerie-backup/${jobName}-${targetName}/repo_url".text = "${targetOptions.serverUrl}${repoPath}"; "clerie-backup/${jobName}-${targetName}/auth_username".text = targetUsername; "clerie-backup/${jobName}-${targetName}/auth_password".source = targetPasswordFile; "clerie-backup/${jobName}-${targetName}/files".text = concatStringsSep "\n" jobOptions.paths; @@ -82,7 +82,7 @@ let type = with types; nullOr str; default = null; }; - serverName = mkOption { + serverUrl = mkOption { type = types.str; }; }; From 8e7d18bdcd8748a3fd1f06007dd9ed9188578baa Mon Sep 17 00:00:00 2001 From: Flake Update Bot <flake-update-bot@clerie.de> Date: Thu, 17 Apr 2025 03:03:06 +0200 Subject: [PATCH 3/3] Update nixpkgs 2025-04-17-01-03 --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index e7345fc..9347772 100644 --- a/flake.lock +++ b/flake.lock @@ -533,11 +533,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1742069588, - "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", + "lastModified": 1744463964, + "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", + "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", "type": "github" }, "original": {