From 4e44dc164a7a3518153959d8fe10c35f1fe5aec7 Mon Sep 17 00:00:00 2001 From: Tim Schubert Date: Sun, 8 Dec 2024 13:03:45 +0100 Subject: [PATCH 1/3] fix: enable backup1 --- nixos/modules/backup.nix | 2 +- nixos/modules/profiles/backup.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/backup.nix b/nixos/modules/backup.nix index c18aeb8..0ec680f 100644 --- a/nixos/modules/backup.nix +++ b/nixos/modules/backup.nix @@ -156,7 +156,7 @@ in }; }; - services.borgbackup.jobs.backup1 = mkIf cfg.bs.enable { + services.borgbackup.jobs.backup1 = mkIf cfg.backup1.enable { paths = "/"; exclude = backupExcludes; repo = "borg@backup1.dadada.li:/mnt/storage/backups/${config.networking.hostName}"; diff --git a/nixos/modules/profiles/backup.nix b/nixos/modules/profiles/backup.nix index a69a89c..a5ad0eb 100644 --- a/nixos/modules/profiles/backup.nix +++ b/nixos/modules/profiles/backup.nix @@ -4,7 +4,7 @@ let in { dadada.backupClient.bs = { - enable = lib.mkDefault true; + enable = lib.mkDefault false; passphrasePath = config.age.secrets."${config.networking.hostName}-backup-passphrase".path; sshIdentityFile = config.age.secrets."${config.networking.hostName}-backup-ssh-key".path; }; From 776f7d2000879e0ec43741cd54f11f8fe7115a6c Mon Sep 17 00:00:00 2001 From: Tim Schubert Date: Sun, 8 Dec 2024 13:04:37 +0100 Subject: [PATCH 2/3] feat(laptop): remove ssh agent enable by default --- nixos/modules/profiles/laptop.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/profiles/laptop.nix b/nixos/modules/profiles/laptop.nix index 85e8e86..a525106 100644 --- a/nixos/modules/profiles/laptop.nix +++ b/nixos/modules/profiles/laptop.nix @@ -16,7 +16,6 @@ with lib; { networking.domain = mkDefault "dadada.li"; services.fwupd.enable = mkDefault true; - programs.ssh.startAgent = true; programs.ssh.enableAskPassword = true; programs.nix-ld.enable = true; From 96dcd17947fff6c172597d2cd79bd3f19e04d5ae Mon Sep 17 00:00:00 2001 From: Tim Schubert Date: Sun, 8 Dec 2024 13:10:22 +0100 Subject: [PATCH 3/3] feat(gorgon): enable ssh-agent --- nixos/gorgon/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/gorgon/configuration.nix b/nixos/gorgon/configuration.nix index 12723e0..935052a 100644 --- a/nixos/gorgon/configuration.nix +++ b/nixos/gorgon/configuration.nix @@ -43,6 +43,8 @@ in repo = "u355513-sub1@u355513-sub1.your-storagebox.de:/home/backup"; }; + programs.ssh.startAgent = true; + nix.extraOptions = '' experimental-features = nix-command flakes # Prevent garbage collection for nix shell and direnv