etorres/nixos
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into services

Browse Source
This commit is contained in:
Eric Torres
2025-08-31 15:54:42 -07:00
parent 5c0195d8b1 ca7eb9f353
commit 7b6cb0f6ac
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
base/borg-config.nix
View File

@@ -135,6 +135,8 @@ in
];
encryption_passcommand = ''cat ${config.sops.secrets."borgmatic_pass/local".path}'';
compression = "zstd";
keep_daily = 7;
keep_weekly = 4;
keep_monthly = 12;
@@ -170,6 +172,8 @@ in
unknown_unencrypted_repo_access_is_ok = false;
compression = "zstd";
ssh_command = sshCommand;
mariadb_databases = cfg.mariadbDatabases;

4
hosts/app-01/hardware-configuration.nix
View File

@@ -42,8 +42,8 @@
};
fileSystems."/mnt/data" = {
device = "/dev/disk/by-uuid/68de6372-0a77-498d-af90-28442b85872e";
fsType = "btrfs";
device = "/dev/disk/by-uuid/e8c98e59-0b3f-4b12-ad5c-91735fec0ac5";
fsType = "ext4";
};
swapDevices = [

12
hosts/borg-01/default.nix
View File

@@ -19,26 +19,26 @@
services.borgbackup.repos = {
"appdata" = {
authorizedKeys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAVFnxB+9zrj6Qwbh1DtOqBi6ZtxwSCh2u2OullT5DYX root@nixos"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAVFnxB+9zrj6Qwbh1DtOqBi6ZtxwSCh2u2OullT5DYX borg@app-01"
];
path = "/mnt/data/backups/appdata";
};
"db-mdb11" = {
authorizedKeys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHhMXZ33s0TP6knwSt2U+bP7XknRPNJYYtfwFbpi0pdB root@nixos"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHhMXZ33s0TP6knwSt2U+bP7XknRPNJYYtfwFbpi0pdB borg@db-mdb11"
];
path = "/mnt/data/backups/databases/db-mdb11";
};
"db-pg17" = {
authorizedKeys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINxSft5QAqncZHW8PC1iWF+I0Jg0POlhWxvdEG8DnLfM root@db-pg17"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINxSft5QAqncZHW8PC1iWF+I0Jg0POlhWxvdEG8DnLfM borg@db-pg17"
];
path = "/mnt/data/backups/databases/db-pg17";
};
"fs-01" = {
authorizedKeys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFUk27CQfNy/qaXnUH1jkpy/X/m3sI2psqWstg6XstX5 root@fs-01"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFUk27CQfNy/qaXnUH1jkpy/X/m3sI2psqWstg6XstX5 borg@fs-01"
];
path = "/mnt/data/backups/syncthing";
};
@@ -51,13 +51,13 @@
};
"minecraft" = {
authorizedKeys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH382RP2C+0ak5HosVCAKyZsQy7TM17OruwDxPrgjQ4s root@nixos"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH382RP2C+0ak5HosVCAKyZsQy7TM17OruwDxPrgjQ4s borg@gms-01"
];
path = "/mnt/data/backups/minecraft";
};
"radon" = {
authorizedKeys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHa8Zl+D7p7/aby5o9JoADFX1JuOQfdbee4iQUxcOxLl root@radon"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHa8Zl+D7p7/aby5o9JoADFX1JuOQfdbee4iQUxcOxLl borg@radon"
];
path = "/mnt/data/backups/hosts/radon";
};

3
hosts/test-nixos/default.nix
View File

@@ -12,9 +12,6 @@
qemu.enable = true;
spice.enable = true;
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
base.userSSHKeys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILiUy2yjIkdryH7pYMdkCNryy9gceqXJ7bhtMvvpPBIk etorres@xenon"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILPByHF+TF/4rsMtZ+HxZfwmNi83sia5t+OHjn8X7BHn etorres@radon"