From f0e98c8e42c2bf2ab93241f2556e24a01cffe1f2 Mon Sep 17 00:00:00 2001 From: Alex Wied Date: Wed, 13 Jul 2022 02:45:57 -0400 Subject: [PATCH 1/2] Add support for pure evaluation mode --- find-files.nix | 12 +++++++----- home.nix | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 home.nix diff --git a/find-files.nix b/find-files.nix index 09018db..fa18704 100644 --- a/find-files.nix +++ b/find-files.nix @@ -204,15 +204,17 @@ rec { # Finding git config # + home = if lib.inPureEvalMode then _: /nonexistent else import ./home.nix; + maybeXdgGitConfigFile = for (guardNonEmptyString (builtins.getEnv "XDG_CONFIG_HOME")) (xdgConfigHome: guardFile (/. + xdgConfigHome + "/git/config") ); - maybeGlobalConfig = take 1 (guardFile ~/.gitconfig + maybeGlobalConfig = take 1 (guardFile (home /.gitconfig) ++ maybeXdgGitConfigFile - ++ guardFile ~/.config/git/config); + ++ guardFile (home /.config/git/config)); globalConfigItems = for maybeGlobalConfig (globalConfigFile: parse-ini.parseIniFile globalConfigFile @@ -224,7 +226,7 @@ rec { for (guard (toLower section == "core" && toLower key == "excludesfile")) (_: - resolveFile (~/.) value + resolveFile (home /.) value ) ) ); @@ -236,7 +238,7 @@ rec { maybeGlobalIgnoresFile = take 1 ( globalConfiguredExcludesFile ++ xdgExcludesFile - ++ guardFile ~/.config/git/ignore); + ++ guardFile (home /.config/git/ignore)); /* Given baseDir, which generalizes the idea of working directory, resolve a file path relative to that directory. @@ -247,7 +249,7 @@ rec { */ resolveFile = baseDir: path: take 1 ( if hasPrefix "/" path then guardFile (/. + path) else - (if hasPrefix "~" path then guardFile (~/. + removePrefix "~" path) else []) + (if hasPrefix "~" path then guardFile (home /. + removePrefix "~" path) else []) ++ guardFile (baseDir + "/" + path) ) ; diff --git a/home.nix b/home.nix new file mode 100644 index 0000000..fa3ed03 --- /dev/null +++ b/home.nix @@ -0,0 +1 @@ +path: ~/. + path From cbafce846580d04147f4e093d85436170792e898 Mon Sep 17 00:00:00 2001 From: Alex Wied <543423+centromere@users.noreply.github.com> Date: Wed, 13 Jul 2022 05:18:32 -0400 Subject: [PATCH 2/2] Update find-files.nix Co-authored-by: Robert Hensing --- find-files.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/find-files.nix b/find-files.nix index fa18704..e7ddd61 100644 --- a/find-files.nix +++ b/find-files.nix @@ -204,7 +204,7 @@ rec { # Finding git config # - home = if lib.inPureEvalMode then _: /nonexistent else import ./home.nix; + home = if lib.inPureEvalMode or false then _: /nonexistent else import ./home.nix; maybeXdgGitConfigFile = for