colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

modules: impermanence: use sane-lib.path

Browse Source
This commit is contained in:
colin
2023-01-03 14:55:27 +00:00
parent 93f1411522
commit afe684ca2c
2 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
modules/impermanence/default.nix
View File

@@ -2,10 +2,11 @@
# https://xeiaso.net/blog/paranoid-nixos-2021-07-18
# https://elis.nu/blog/2020/05/nixos-tmpfs-as-root/
# https://github.com/nix-community/impermanence
{ config, lib, pkgs, utils, ... }:
{ config, lib, pkgs, utils, sane-lib, ... }:
with lib;
let
path = sane-lib.path;
cfg = config.sane.impermanence;
storeType = types.submodule {
@@ -34,21 +35,6 @@ let
};
};
# split the string path into a list of string components.
# root directory "/" becomes the empty list [].
# implicitly performs normalization so that:
# splitPath "a//b/" => ["a" "b"]
# splitPath "/a/b" => ["a" "b"]
splitPath = str: builtins.filter (seg: (builtins.isString seg) && seg != "" ) (builtins.split "/" str);
# return a string path, with leading slash but no trailing slash
joinPathAbs = comps: "/" + (builtins.concatStringsSep "/" comps);
concatPaths = paths: joinPathAbs (builtins.concatLists (builtins.map (p: splitPath p) paths));
# return the path from `from` to `to`, but generally in absolute form.
# e.g. `pathFrom "/home/colin" "/home/colin/foo/bar"` -> "/foo/bar"
pathFrom = from: to:
assert lib.hasPrefix from to;
lib.removePrefix from to;
# options for a single mountpoint / persistence
dirEntryOptions = {
options = {
@@ -139,7 +125,7 @@ let
mapDirs = relativeTo: store: dirs: (map
(d: {
inherit (d) user group mode;
directory = concatPaths [ relativeTo d.directory ];
directory = path.concat [ relativeTo d.directory ];
store = cfg.stores."${store}";
})
dirs
@@ -185,8 +171,8 @@ in
cfgFor = opt:
let
store = opt.store;
store-rel-path = pathFrom store.prefix opt.directory;
backing-path = concatPaths [ store.mountpt store-rel-path ];
store-rel-path = path.from store.prefix opt.directory;
backing-path = path.concat [ store.mountpt store-rel-path ];
# pass through the perm/mode overrides
dir-acl = {

20
modules/lib/default.nix
View File

@@ -7,15 +7,25 @@ rec {
# implicitly performs normalization so that:
# split "a//b/" => ["a" "b"]
# split "/a/b" => ["a" "b"]
split = str: builtins.filter (seg: (builtins.isString seg) && seg != "" ) (builtins.split "/" str);
# return a string path, with leading slash but no trailing slash
joinAbs = comps: "/" + (builtins.concatStringsSep "/" comps);
concat = paths: path.joinAbs (builtins.concatLists (builtins.map path.split paths));
split = str: builtins.filter (seg: seg != "") (lib.splitString "/" str);
# given an array of components, returns the equivalent string path
join = comps: "/" + (builtins.concatStringsSep "/" comps);
# given an a sequence of string paths, concatenates them into one long string path
concat = paths: path.join (builtins.concatLists (builtins.map path.split paths));
# normalize the given path
norm = str: path.joinAbs (path.split str);
norm = str: path.join (path.split str);
# return the parent directory. doesn't care about leading/trailing slashes.
# the parent of "/" is "/".
parent = str: path.norm (builtins.dirOf (path.norm str));
hasParent = str: (path.parent str) != (path.norm str);
# return the path from `from` to `to`, but keeping absolute form
# e.g. `pathFrom "/home/colin" "/home/colin/foo/bar"` -> "/foo/bar"
from = start: end: let
s = path.norm start;
e = path.norm end;
in (
assert lib.hasPrefix s e;
"/" + (lib.removePrefix s e)
);
};
}