asonix/sbc-deploys
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Update deps, remove unneeded subvolumes from garage

Browse source
This commit is contained in:
asonix 2023-02-18 23:11:42 -06:00
parent 1795143afc
commit e25de0cd1e
3 changed files with 52 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
flake.lock
View file

@ -40,16 +40,17 @@
},
"image-builder": {
"inputs": {
"nixos-generators": "nixos-generators",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1675534526,
"narHash": "sha256-w5hduMTh8JnLCfgu47geFOkLAJdi8+hUkLFa2N5JCGk=",
"lastModified": 1676751956,
"narHash": "sha256-01e8pPqyIjYojni5DXTknIgcXEQBX6b2ympib/VLKvA=",
"ref": "refs/heads/main",
"rev": "18257bffed72d8479f6a6eb57fd8bbf24fc92f03",
"revCount": 61,
"rev": "c7e9be024f54068957c53055932c878782b7f0ce",
"revCount": 64,
"type": "git",
"url": "https://git.asonix.dog/asonix/nixos-aarch64-images"
},
@ -58,6 +59,43 @@
"url": "https://git.asonix.dog/asonix/nixos-aarch64-images"
}
},
"nixlib": {
"locked": {
"lastModified": 1636849918,
"narHash": "sha256-nzUK6dPcTmNVrgTAC1EOybSMsrcx+QrVPyqRdyKLkjA=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "28a5b0557f14124608db68d3ee1f77e9329e9dd5",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixos-generators": {
"inputs": {
"nixlib": "nixlib",
"nixpkgs": [
"image-builder",
"nixpkgs"
]
},
"locked": {
"lastModified": 1676297861,
"narHash": "sha256-YECUmK34xzg0IERpnbCnaO6z6YgfecJlstMWX7dqOZ8=",
"owner": "nix-community",
"repo": "nixos-generators",
"rev": "1e0a05219f2a557d4622bc38f542abb360518795",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixos-generators",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1675921593,
@ -76,11 +114,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1675556398,
"narHash": "sha256-5Gf5KlmFXfIGVQb2hmiiE7FQHoLd4UtEhIolLQvNB/A=",
"lastModified": 1676771332,
"narHash": "sha256-YYn2K0AwyIyCzvP7C+xzEt64rlCRPyrllRPGNNu+50M=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e32c33811815ca4a535a16faf1c83eeb4493145b",
"rev": "f27a4e2f6a3a23b843ca1c736e6043fb8b99acc1",
"type": "github"
},
"original": {
@ -106,11 +144,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1675872570,
"narHash": "sha256-RPH3CeTv7ixC2WcYiKyhmIgoH/9tur4Kr+3Vg/pleQk=",
"lastModified": 1676776227,
"narHash": "sha256-CSBeyGiDMYDw/nmafLfuu0ErVu7rzGoWIQwm2NkQQKY=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "8fec29b009c19538e68d5d814ec74e04f662fbd1",
"rev": "1da7257baa1d6801c45d9d3dedae7ce79c0e6498",
"type": "github"
},
"original": {

6
flake.nix
View file

@ -34,6 +34,7 @@
sops-nix.nixosModules.sops
sharedModule
userModule
baseModule
{
networking.hostName = hostname;
}
@ -307,15 +308,10 @@
device = "/dev/mapper/cryptdrive1";
mountDir = "/btrfs/hdd";
subvolumes = [
"@nc-config"
"@nc-data"
"@redis"
"@gitea"
"@gitea-conf"
"@pihole"
"@docker-cfg"
"@garage"
"@garage-config"
];
garageVolumes = [
"@garage-cluster"

6
modules/btrbk/default.nix
View file

@ -44,9 +44,9 @@ let
ssh_identity = config.sops.secrets.private_key.path;
ssh_user = "btrbk";
stream_buffer = "512m";
stream_compress = "gzip";
stream_compress_level = "default";
stream_compress_threads = "default";
# stream_compress = "gzip";
# stream_compress_level = "default";
# stream_compress_threads = "default";
target_preserve = "24h 7d";
target_preserve_min = "24h";
transaction_log = "/var/log/btrbk.log";