From 2c6c07ec5f0d5ebadef35bcc5212bee9f4330fb4 Mon Sep 17 00:00:00 2001 From: Soispha Date: Fri, 7 Jul 2023 07:57:19 +0200 Subject: Refactor(system/impermanence): Move to own directory --- system/default.nix | 1 + system/file_system_layouts/default.nix | 4 ---- system/file_system_layouts/impermanence.nix | 26 -------------------------- system/impermanence/default.nix | 26 ++++++++++++++++++++++++++ 4 files changed, 27 insertions(+), 30 deletions(-) delete mode 100644 system/file_system_layouts/impermanence.nix create mode 100644 system/impermanence/default.nix diff --git a/system/default.nix b/system/default.nix index 4b52b79..e1cdb28 100644 --- a/system/default.nix +++ b/system/default.nix @@ -1,6 +1,7 @@ {...}: { imports = [ ./file_system_layouts + ./impermanence ./packages ./services ./users diff --git a/system/file_system_layouts/default.nix b/system/file_system_layouts/default.nix index d038632..95400bd 100644 --- a/system/file_system_layouts/default.nix +++ b/system/file_system_layouts/default.nix @@ -6,10 +6,6 @@ with lib; let cfg = config.system.fileSystemLayouts; in { - imports = [ - ./impermanence.nix - ]; - options.system.fileSystemLayouts = { mainDisk = mkOption { type = lib.types.path; diff --git a/system/file_system_layouts/impermanence.nix b/system/file_system_layouts/impermanence.nix deleted file mode 100644 index 32ad9f7..0000000 --- a/system/file_system_layouts/impermanence.nix +++ /dev/null @@ -1,26 +0,0 @@ -{...}: { - 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" - ]; - }; -} diff --git a/system/impermanence/default.nix b/system/impermanence/default.nix new file mode 100644 index 0000000..32ad9f7 --- /dev/null +++ b/system/impermanence/default.nix @@ -0,0 +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" + ]; + }; +} -- cgit 1.4.1