diff --git a/lib/default.nix b/lib/default.nix index 2ab3540..9f98b7a 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -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))); } - diff --git a/systems/jeroboam/default.nix b/systems/jeroboam/default.nix index 2cd307e..774e0be 100644 --- a/systems/jeroboam/default.nix +++ b/systems/jeroboam/default.nix @@ -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"