diff --git a/nixos/gorgon/configuration.nix b/nixos/gorgon/configuration.nix index 935052a..12723e0 100644 --- a/nixos/gorgon/configuration.nix +++ b/nixos/gorgon/configuration.nix @@ -43,8 +43,6 @@ 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 diff --git a/nixos/modules/backup.nix b/nixos/modules/backup.nix index 0ec680f..c18aeb8 100644 --- a/nixos/modules/backup.nix +++ b/nixos/modules/backup.nix @@ -156,7 +156,7 @@ in }; }; - services.borgbackup.jobs.backup1 = mkIf cfg.backup1.enable { + services.borgbackup.jobs.backup1 = mkIf cfg.bs.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 a5ad0eb..a69a89c 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 false; + enable = lib.mkDefault true; passphrasePath = config.age.secrets."${config.networking.hostName}-backup-passphrase".path; sshIdentityFile = config.age.secrets."${config.networking.hostName}-backup-ssh-key".path; }; diff --git a/nixos/modules/profiles/laptop.nix b/nixos/modules/profiles/laptop.nix index a525106..85e8e86 100644 --- a/nixos/modules/profiles/laptop.nix +++ b/nixos/modules/profiles/laptop.nix @@ -16,6 +16,7 @@ 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;