use my fork for borgbackup module

This commit is contained in:
cy 2024-12-27 21:03:55 -05:00
parent 6600c19b52
commit 480991e3a9
5 changed files with 31 additions and 7 deletions

23
flake.lock generated
View file

@ -22,11 +22,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1735291276, "lastModified": 1734649271,
"narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "634fd46801442d760e09493a794c4f15db2d0cbb", "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -36,10 +36,27 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-borg": {
"locked": {
"lastModified": 1735348460,
"narHash": "sha256-ScKuaBbUXNqS9c6Y+N647BAQx7SvKywpu5MxBV3Y5pk=",
"owner": "cything",
"repo": "nixpkgs",
"rev": "e8391ed9a627dcc13c783d25d72d822c491871b6",
"type": "github"
},
"original": {
"owner": "cything",
"ref": "borg",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-borg": "nixpkgs-borg",
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
} }
}, },

View file

@ -11,6 +11,7 @@
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixpkgs-borg.url = "github:cything/nixpkgs/borg";
}; };
outputs = outputs =

View file

@ -43,8 +43,6 @@
]; ];
# warnings are often not that serious # warnings are often not that serious
failOnWarnings = false; failOnWarnings = false;
# anything other than exit code 1 is considered failure and BORG_EXIT_CODES=modern uses a whole lot more codes for warning
appendFailedSuffix = false;
postHook = '' postHook = ''
${pkgs.curl}/bin/curl -u $(cat ${ ${pkgs.curl}/bin/curl -u $(cat ${
config.sops.secrets."services/ntfy".path config.sops.secrets."services/ntfy".path

View file

@ -2,6 +2,7 @@
config, config,
lib, lib,
pkgs, pkgs,
inputs,
... ...
}: }:
{ {
@ -26,6 +27,10 @@
./conduit.nix ./conduit.nix
./immich.nix ./immich.nix
./element.nix ./element.nix
{
disabledModules = [ "services/backup/borgbackup.nix"];
}
(inputs.nixpkgs-borg + "/nixos/modules/services/backup/borgbackup.nix")
]; ];
sops.age.keyFile = "/root/.config/sops/age/keys.txt"; sops.age.keyFile = "/root/.config/sops/age/keys.txt";

View file

@ -2,12 +2,17 @@
config, config,
pkgs, pkgs,
lib, lib,
inputs,
... ...
}: }:
{ {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
../common.nix ../common.nix
{
disabledModules = [ "services/backup/borgbackup.nix"];
}
(inputs.nixpkgs-borg + "/nixos/modules/services/backup/borgbackup.nix")
]; ];
sops.age.keyFile = "/root/.config/sops/age/keys.txt"; sops.age.keyFile = "/root/.config/sops/age/keys.txt";
@ -224,8 +229,6 @@
]; ];
# warnings are often not that serious # warnings are often not that serious
failOnWarnings = false; failOnWarnings = false;
# anything other than exit code 1 is considered failure and BORG_EXIT_CODES=modern uses a whole lot more codes for warning
appendFailedSuffix = false;
postHook = '' postHook = ''
${pkgs.curl}/bin/curl -u $(cat ${ ${pkgs.curl}/bin/curl -u $(cat ${
config.sops.secrets."services/ntfy".path config.sops.secrets."services/ntfy".path