fix(lib relativeToRoot): revert to old pattern, pay attention to proper path formats

This commit is contained in:
madmin 2024-07-17 23:58:52 +02:00
parent 9d231fae6a
commit 3016a8fe6d
2 changed files with 4 additions and 4 deletions

View File

@ -1,5 +1,7 @@
{ lib, ... }:
{
# use path relative to the root of the project
relativeToRoot = lib.path.append ../.;
scanPaths = path:
builtins.map
(f: (path + "/${f}"))
@ -19,4 +21,3 @@
)
(builtins.readDir path)));
}

View File

@ -20,7 +20,7 @@
#################### Disk Layout ####################
inputs.disko.nixosModules.disko
(configLib.relativeToRoot "systems/common/disks/jeroboam.nix")
( configLib.relativeToRoot "systems/common/disks/jeroboam.nix")
{
_module.args = {
disk = "/dev/nvme0n1";
@ -29,7 +29,7 @@
};
}
]
++ (map (x: "${self}/" + x) [
++ (map configLib.relativeToRoot [
# = Required Configs ####################
"systems/common/core"
@ -46,7 +46,6 @@
# Desktop
#"systems/common/optional/services/greetd.nix" # display manager
#"systems/common/optional/hyprland.nix" # window manager
""
#################### Users to Create ####################
#"systems/common/users/zhuangzi"
"systems/common/users/laozi"