diff --git a/snowfall-lib/fs/default.nix b/snowfall-lib/fs/default.nix index ea74090..bb1f082 100644 --- a/snowfall-lib/fs/default.nix +++ b/snowfall-lib/fs/default.nix @@ -35,8 +35,8 @@ in { ## ```nix ## "/user-source/systems" ## ``` - #@ String -> Path - get-file = path: user-inputs.src + "/${path}"; + #@ String -> String + get-file = path: "${user-inputs.src}/${path}"; ## Get a file path relative to the user's snowfall directory. ## Example Usage: @@ -47,8 +47,8 @@ in { ## ```nix ## "/user-source/snowfall-dir/systems" ## ``` - #@ String -> Path - get-snowfall-file = path: snowfall-config.root + "/${path}"; + #@ String -> String + get-snowfall-file = path: "${snowfall-config.root}/${path}"; ## Get a file path relative to the this flake. ## Example Usage: @@ -59,8 +59,8 @@ in { ## ```nix ## "/user-source/systems" ## ``` - #@ String -> Path - internal-get-file = path: core-inputs.src + "/${path}"; + #@ String -> String + internal-get-file = path: "${core-inputs.src}/${path}"; ## Safely read from a directory if it exists. ## Example Usage: diff --git a/snowfall-lib/module/default.nix b/snowfall-lib/module/default.nix index b4f0edd..1c09e81 100644 --- a/snowfall-lib/module/default.nix +++ b/snowfall-lib/module/default.nix @@ -28,17 +28,7 @@ in { user-modules = snowfall-lib.fs.get-default-nix-files-recursive src; create-module-metadata = module: { name = let - raw-path = builtins.replaceStrings [(builtins.toString src) "/default.nix"] ["" ""] (builtins.unsafeDiscardStringContext module); - # We want to remove the nix store prefix from the entry. - raw-path-parts = builtins.split "/nix/store/[a-zA-Z0-9]{32}-[^/]*/" raw-path; - path-name-parts = builtins.filter builtins.isString raw-path-parts; - normalized-name-parts = - # We don't include the name of the source directory. - if builtins.length path-name-parts > 1 - then tail path-name-parts - else path-name-parts; - - path-name = builtins.concatStringsSep "/" normalized-name-parts; + path-name = builtins.replaceStrings [(builtins.toString src) "/default.nix"] ["" ""] (builtins.unsafeDiscardStringContext module); in if hasPrefix "/" path-name then builtins.substring 1 ((builtins.stringLength path-name) - 1) path-name