From d0a8582807d8a621252f15aad7fdb774a472de23 Mon Sep 17 00:00:00 2001 From: Soispha Date: Wed, 5 Jul 2023 21:27:50 +0200 Subject: Style(system/fs_layouts): Merge attrsets --- system/file_system_layouts/impermanence.nix | 48 ++++++++++++++--------------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/system/file_system_layouts/impermanence.nix b/system/file_system_layouts/impermanence.nix index 23254e4..32ad9f7 100644 --- a/system/file_system_layouts/impermanence.nix +++ b/system/file_system_layouts/impermanence.nix @@ -1,28 +1,26 @@ {...}: { - environment.persistence = { - "/srv" = { - hideMounts = true; - directories = [ - "/etc/nixos" - "/var/log" - "/var/lib/postgresql" - "/var/lib/acme" - { - directory = "/var/lib/nix-sync"; - user = "nix-sync"; - group = "nix-sync"; - mode = "0700"; - } - { - directory = "/var/lib/sshd"; - user = "root"; - group = "root"; - mode = "0755"; - } - ]; - files = [ - "/etc/machine-id" - ]; - }; + environment.persistence."/srv" = { + hideMounts = true; + directories = [ + "/etc/nixos" + "/var/log" + "/var/lib/postgresql" + "/var/lib/acme" + { + directory = "/var/lib/nix-sync"; + user = "nix-sync"; + group = "nix-sync"; + mode = "0700"; + } + { + directory = "/var/lib/sshd"; + user = "root"; + group = "root"; + mode = "0755"; + } + ]; + files = [ + "/etc/machine-id" + ]; }; } -- cgit 1.4.1