From 55cbce17c21190006502debfbd79e81ee793381f Mon Sep 17 00:00:00 2001 From: colin Date: Sat, 22 Oct 2022 06:03:04 -0700 Subject: [PATCH] refactor: impermanence: remove duplicate function `map-service-dirs` --- modules/impermanence.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/modules/impermanence.nix b/modules/impermanence.nix index 2804f902..47a21a5f 100644 --- a/modules/impermanence.nix +++ b/modules/impermanence.nix @@ -34,7 +34,6 @@ in map-home-dirs = map-dirs { user = "colin"; group = "users"; mode = "0755"; directory = "/home/colin/"; }; map-sys-dirs = map-dirs { user = "root"; group = "root"; mode = "0755"; directory = ""; }; - map-service-dirs = map-dirs { user = "root"; group = "root"; mode = "0755"; directory = ""; }; in mkIf cfg.enable { sane.image.extraDirectories = [ "/nix/persist/var/log" ]; @@ -57,7 +56,6 @@ in # "/etc/ssh" # persist only the specific files we want, instead "/var/log" "/var/backup" # for e.g. postgres dumps - ]) ++ (map-service-dirs ([ # "/var/lib/AccountsService" # not sure what this is, but it's empty "/var/lib/alsa" # preserve output levels, default devices # "/var/lib/blueman" # files aren't human readable @@ -83,8 +81,7 @@ in # servo additions: # "/var/lib/dhparams" # https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/security/dhparams.nix # "/var/lib/dovecot" - # "/var/lib/duplicity" - ] ++ cfg.service-dirs)); + ] ++ cfg.service-dirs); files = [ "/etc/machine-id" "/etc/ssh/ssh_host_ed25519_key"