From a7639b0d3131787b751458ed662084f210923a35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Wed, 5 Apr 2023 08:32:37 +0300 Subject: [PATCH] nix fmt --- configuration.nix | 68 ++++++++++++++++++++++++----------------------- flake.nix | 6 ++--- 2 files changed, 38 insertions(+), 36 deletions(-) diff --git a/configuration.nix b/configuration.nix index c10553a..ed76d08 100644 --- a/configuration.nix +++ b/configuration.nix @@ -237,40 +237,42 @@ in { extraArgs = ["--verbose"]; }; - borgbackup.jobs = lib.mapAttrs' (name: value: let - snapshot = { - mountpoint = value.mountpoint; - zfs_name = value.zfs_name; - }; - rwpath = value.mountpoint + "/.snapshot-latest"; - in { - name = name; - value = - { - doInit = true; - repo = "zh2769@zh2769.rsync.net:hel1-a.servers.jakst"; - encryption = { - mode = "repokey-blake2"; - passCommand = "cat /var/src/secrets/borgbackup/password"; - }; - paths = value.paths; - extraArgs = "--remote-path=borg1"; - compression = "auto,lzma"; - startAt = value.backup_at; - readWritePaths = [rwpath]; - preHook = mountLatest snapshot; - postHook = umountLatest snapshot; - prune.keep = { - within = "1d"; - daily = 7; - weekly = 4; - monthly = 3; - }; - } - // lib.optionalAttrs (value ? patterns) { - patterns = value.patterns; + borgbackup.jobs = + lib.mapAttrs' (name: value: let + snapshot = { + mountpoint = value.mountpoint; + zfs_name = value.zfs_name; }; - }) backup_paths; + rwpath = value.mountpoint + "/.snapshot-latest"; + in { + name = name; + value = + { + doInit = true; + repo = "zh2769@zh2769.rsync.net:hel1-a.servers.jakst"; + encryption = { + mode = "repokey-blake2"; + passCommand = "cat /var/src/secrets/borgbackup/password"; + }; + paths = value.paths; + extraArgs = "--remote-path=borg1"; + compression = "auto,lzma"; + startAt = value.backup_at; + readWritePaths = [rwpath]; + preHook = mountLatest snapshot; + postHook = umountLatest snapshot; + prune.keep = { + within = "1d"; + daily = 7; + weekly = 4; + monthly = 3; + }; + } + // lib.optionalAttrs (value ? patterns) { + patterns = value.patterns; + }; + }) + backup_paths; headscale = { enable = true; diff --git a/flake.nix b/flake.nix index aa43f57..23b562c 100644 --- a/flake.nix +++ b/flake.nix @@ -2,9 +2,9 @@ description = "motiejus/config"; nixConfig = { - trusted-substituters = "https://cache.nixos.org/"; - trusted-public-keys = "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="; - extra-experimental-features = "nix-command flakes"; + trusted-substituters = "https://cache.nixos.org/"; + trusted-public-keys = "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="; + extra-experimental-features = "nix-command flakes"; }; inputs = {