cleanup/refactor users

hosts/common/users/colin.nix

@@ -1,8 +1,5 @@
-{ config, pkgs, lib, sane-lib, ... }:
+{ config, pkgs, lib, ... }:
 
-let
-  fs = sane-lib.fs;
-in
 {
   # docs: https://nixpkgs-manual-sphinx-markedown-example.netlify.app/generated/options-db.xml.html#users-users
   users.users.colin = {
@@ -53,43 +50,45 @@ in
 
   security.pam.mount.enable = true;
 
-  sane.users.colin.default = true;
+  sane.users.colin = {
-  # ensure ~ perms are known to sane.fs module.
+    default = true;
-  # TODO: this is generic enough to be lifted up into sane.fs itself.
+    # ensure ~ perms are known to sane.fs module.
-  sane.fs."/home/colin".dir.acl = {
+    # TODO: this is generic enough to be lifted up into sane.fs itself.
-    user = "colin";
+    fs."/".dir.acl = {
-    group = config.users.users.colin.group;
+      user = "colin";
-    mode = config.users.users.colin.homeMode;
+      group = config.users.users.colin.group;
+      mode = config.users.users.colin.homeMode;
+    };
+
+    persist.plaintext = [
+      "archive"
+      "dev"
+      # TODO: records should be private
+      "records"
+      "ref"
+      "tmp"
+      "use"
+      "Music"
+      "Pictures"
+      "Videos"
+
+      ".cache/nix"
+      ".cache/nix-index"
+
+      # ".cargo"
+      # ".rustup"
+    ];
+
+    # convenience
+    fs."knowledge".symlink.target = "private/knowledge";
+    fs."nixos".symlink.target = "dev/nixos";
+    fs."Books/servo".symlink.target = "/mnt/servo-media/Books";
+    fs."Videos/servo".symlink.target = "/mnt/servo-media/Videos";
+    fs."Videos/servo-incomplete".symlink.target = "/mnt/servo-media/incomplete";
+    fs."Music/servo".symlink.target = "/mnt/servo-media/Music";
+    fs."Pictures/servo-macros".symlink.target = "/mnt/servo-media/Pictures/macros";
+
+    # used by password managers, e.g. unix `pass`
+    fs.".password-store".symlink.target = "knowledge/secrets/accounts";
   };
-
-  sane.user.persist.plaintext = [
-    "archive"
-    "dev"
-    # TODO: records should be private
-    "records"
-    "ref"
-    "tmp"
-    "use"
-    "Music"
-    "Pictures"
-    "Videos"
-
-    ".cache/nix"
-    ".cache/nix-index"
-
-    # ".cargo"
-    # ".rustup"
-  ];
-
-  # convenience
-  sane.user.fs."knowledge" = fs.wantedSymlinkTo "private/knowledge";
-  sane.user.fs."nixos" = fs.wantedSymlinkTo "dev/nixos";
-  sane.user.fs."Books/servo" = fs.wantedSymlinkTo "/mnt/servo-media/Books";
-  sane.user.fs."Videos/servo" = fs.wantedSymlinkTo "/mnt/servo-media/Videos";
-  sane.user.fs."Videos/servo-incomplete" = fs.wantedSymlinkTo "/mnt/servo-media/incomplete";
-  sane.user.fs."Music/servo" = fs.wantedSymlinkTo "/mnt/servo-media/Music";
-  sane.user.fs."Pictures/servo-macros" = fs.wantedSymlinkTo "/mnt/servo-media/Pictures/macros";
-
-  # used by password managers, e.g. unix `pass`
-  sane.user.fs.".password-store" = fs.wantedSymlinkTo "knowledge/secrets/accounts";
 }

modules/users.nix

@@ -12,9 +12,13 @@ let
         type = types.attrs;
         default = {};
         description = ''
-          entries to pass onto `sane.fs` after prepending the user's home-dir to the path.
+        entries to pass onto `sane.fs` after prepending the user's home-dir to the path
+        and marking them as wanted.
           e.g. `sane.users.colin.fs."/.config/aerc" = X`
-            => `sane.fs."/home/colin/.config/aerc" = X;
+          => `sane.fs."/home/colin/.config/aerc" = { wantedBy = [ "multi-user.target"]; } // X;
+
+          conventions are similar as to toplevel `sane.fs`. so `sane.users.foo.fs."/"` represents the home directory,
+          whereas every other entry is expected to *not* have a trailing slash.
         '';
       };
 
@@ -55,9 +59,13 @@ let
         name = path-lib.concat [ defn.home path ];
         inherit value;
       });
+      makeWanted = lib.mapAttrs (n: v: {
+        # default if not otherwise provided
+        wantedBeforeBy = [ "multi-user.target" ];
+      } // v);
     in
     {
-      sane.fs = prefixWithHome defn.fs;
+      sane.fs = makeWanted (prefixWithHome defn.fs);
 
       # `byPath` is the actual output here, computed from the other keys.
       sane.persist.sys.byPath = prefixWithHome defn.persist.byPath;