From f14a0b4be6856bc187754d6651d462750b062b27 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Mon, 5 Jul 2021 00:53:03 +0200
Subject: [PATCH] Fix secretpaths

---
 private.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/private.nix b/private.nix
index cef4fac4..b854d218 100644
--- a/private.nix
+++ b/private.nix
@@ -1,7 +1,10 @@
 let
+  persistPath = "/disk/persist/maralorn";
+  hasPersistDisk = builtins.pathExists persistPath;
   privateExists = builtins.pathExists private/submodule-is-checked-out;
-  explicitUsePrivate = builtins.getEnv "WITH_SECRETS" == "true";
-  explicitNotUsePrivate = builtins.getEnv "WITH_SECRETS" == "false";
+  var = "WITH_SECRETS";
+  explicitUsePrivate = builtins.getEnv var == "true";
+  explicitNotUsePrivate = builtins.getEnv var == "false";
   usePrivate = !explicitNotUsePrivate && (explicitUsePrivate || privateExists);
   withSecrets = builtins.trace
     (if usePrivate then
@@ -13,7 +16,7 @@ in
 {
   inherit withSecrets;
   privatePath = name:
-    let path = "/etc/nixos/private/${name}";
+    let path = "${if hasPersistDisk then persistPath else "/home/maralorn"}/git/config/private/${name}";
     in if withSecrets then assert builtins.pathExists (./private + "/${name}"); path else path;
   privateValue = default: name:
     if withSecrets then import (./private + "/${name}.nix") else default;