treewide: Align modules with server directory

1 files changed, 17 insertions, 32 deletions

diff --git a/modules/by-name/im/impermanence/module.nix b/modules/by-name/im/impermanence/module.nix
index 43943363..be3bacdc 100644
--- a/modules/by-name/im/impermanence/module.nix
+++ b/modules/by-name/im/impermanence/module.nix
@@ -13,9 +13,15 @@
   modules,
   ...
 }: let
-  cfg = config.soispha.impermanence;
+  cfg = config.vhack.impermanence;
+
+  userDirectories = lib.debug.traceValSeqN 2 (lib.mapAttrs (_: dirs: {
+      directories =
+        dirs;
+    })
+    cfg.userDirectories);
 in {
-  options.soispha.impermanence = {
+  options.vhack.impermanence = {
     enable = lib.mkEnableOption "persisting directories and files with impermanence";
 
     directories = lib.mkOption {
@@ -33,7 +39,7 @@ in {
     };
 
     userDirectories = lib.mkOption {
-      type = lib.types.listOf (lib.types.either lib.types.str (lib.types.submodule {
+      type = lib.attrsOf lib.types.listOf (lib.types.either lib.types.str (lib.types.submodule {
         options = {
           directory = lib.mkOption {
             type = lib.types.str;
@@ -44,7 +50,7 @@ in {
         };
       }));
       default = [];
-      description = "The directories to persist";
+      description = "The directories to persist, for each user.";
     };
   };
 
@@ -53,36 +59,15 @@ in {
   ];
 
   config = lib.mkIf cfg.enable {
-    environment.persistence = {
-      "/srv" = {
-        hideMounts = true;
-        inherit (cfg) directories;
-
-        users.soispha = {
-          directories =
-            [
-              # TODO: These should all be moved to their respective modules <2024-12-08>
-              ".local/share"
+    environment.persistence."/srv" = {
+      hideMounts = true;
+      inherit (cfg) directories;
 
-              ".local/state/nvim"
-              ".local/state/mpv"
-              ".local/state/wireplumber"
-
-              ".config/Signal"
-
-              ".cache"
-
-              "media"
-              "repos"
-              "documents"
-            ]
-            ++ cfg.userDirectories;
-        };
+      users = userDirectories;
 
-        files = [
-          "/etc/machine-id"
-        ];
-      };
+      files = [
+        "/etc/machine-id"
+      ];
     };
   };
 }