From b2eb267100a0ba2319eda20dfdbd44e6a31127bc Mon Sep 17 00:00:00 2001 From: Fabian Hauser Date: Sat, 27 Jun 2020 23:22:08 +0200 Subject: [PATCH] Correct nixfmt --- host/montalin/applications/cloud.nix | 5 ++--- host/montalin/applications/default.nix | 3 +-- host/montalin/backup.nix | 24 ++++++++++-------------- host/montalin/database.nix | 2 +- host/montalin/default.nix | 3 +-- host/montalin/filesystems.nix | 3 +-- 6 files changed, 16 insertions(+), 24 deletions(-) diff --git a/host/montalin/applications/cloud.nix b/host/montalin/applications/cloud.nix index a7e6e79..8aa3c4d 100644 --- a/host/montalin/applications/cloud.nix +++ b/host/montalin/applications/cloud.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { imports = [ @@ -9,5 +8,5 @@ services.nextcloud = { hostName = "cloud.qo.is"; package = pkgs.nextcloud19; - } + }; } diff --git a/host/montalin/applications/default.nix b/host/montalin/applications/default.nix index 6e56662..064f28d 100644 --- a/host/montalin/applications/default.nix +++ b/host/montalin/applications/default.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { imports = [ ./cloud.nix diff --git a/host/montalin/backup.nix b/host/montalin/backup.nix index ce7483c..b548ef5 100644 --- a/host/montalin/backup.nix +++ b/host/montalin/backup.nix @@ -1,34 +1,30 @@ { config, pkgs, ... }: -let mountService = "var-backup.mount"; - repo = "/var/backup/montalin"; # TODO: Does this make sense? -{ - services.borgbackup.jobs = rec { +let + mountService = "var-backup.mount"; + repo = "/var/backup/montalin"; # TODO: Does this make sense? +in { + services.borgbackup.jobs = { data = { exclude = [ - "/var/backup" #TODO: Does this make sense? + "/var/backup" # TODO: Does this make sense? "/var/tmp" "/var/cache" ]; - paths = [ - "/etc" - "/home" - "/root" - "/var" - ]; + paths = [ "/etc" "/home" "/root" "/var" ]; preHook = "systemctl mount ${mountService}"; postHook = "systemctl stop ${mountService}"; prune.keep = { within = "14d"; weekly = 4; - monthly 6; + monthly = 6; yearly = -1; }; removeableDevices = true; repo = repo; - startAt = ; #TODO: systemdtime - environment.BORG_BASE_DIR="${repo}/borg-base-dir"; + startAt = "07:00:"; + environment.BORG_BASE_DIR = "${repo}/borg-base-dir"; }; }; } diff --git a/host/montalin/database.nix b/host/montalin/database.nix index 59e0bc0..4dc2545 100644 --- a/host/montalin/database.nix +++ b/host/montalin/database.nix @@ -7,5 +7,5 @@ package = pkgs.postgresql_12; }; - services.postgresqlBackup.enable = true; #TODO: Role? + services.postgresqlBackup.enable = true; # TODO: Role? } diff --git a/host/montalin/default.nix b/host/montalin/default.nix index 5289b12..e8a5f0b 100644 --- a/host/montalin/default.nix +++ b/host/montalin/default.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { imports = [ ./networking.nix diff --git a/host/montalin/filesystems.nix b/host/montalin/filesystems.nix index 0f23ee4..687552b 100644 --- a/host/montalin/filesystems.nix +++ b/host/montalin/filesystems.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { boot.initrd.luks.devices = { "root".device = "/dev/disk/by-uuid/3a0a5071-67ab-4e13-a0b7-d31b86f5e8b1"; "swap".device = "/dev/disk/by-uuid/6dee6e3c-e2f3-46c5-8751-5fce8c80ed49";