Nix
/
nix-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/default.nix
View File

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

3
systems/jeroboam/default.nix
View File

@ -29,7 +29,7 @@
}; };
} }
] ]
++ (map (x: "${self}/" + x) [ ++ (map configLib.relativeToRoot [
# = Required Configs #################### # = Required Configs ####################
"systems/common/core" "systems/common/core"
@ -46,7 +46,6 @@
# Desktop # Desktop
#"systems/common/optional/services/greetd.nix" # display manager #"systems/common/optional/services/greetd.nix" # display manager
#"systems/common/optional/hyprland.nix" # window manager #"systems/common/optional/hyprland.nix" # window manager
""
#################### Users to Create #################### #################### Users to Create ####################
#"systems/common/users/zhuangzi" #"systems/common/users/zhuangzi"
"systems/common/users/laozi" "systems/common/users/laozi"