From c1d48ccf864180d45dc01f0f103edfcea06fcadb Mon Sep 17 00:00:00 2001
From: Alexander Bantyev <balsoft@balsoft.ru>
Date: Wed, 16 Jun 2021 01:09:59 +0300
Subject: [PATCH] Fix secrets more

---
 modules/secrets-envsubst.nix           | 2 +-
 modules/workspace/i3blocks/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/secrets-envsubst.nix b/modules/secrets-envsubst.nix
index 8f24d4b..31b0023 100644
--- a/modules/secrets-envsubst.nix
+++ b/modules/secrets-envsubst.nix
@@ -97,7 +97,7 @@ let
   mkIndividualSecrets = name: cfg:
     map (x: {
       "${name}-envsubst-${x}" = {
-        encrypted = "/home/balsoft/.password-store/${
+        encrypted = "${config.environment.sessionVariables.PASSWORD_STORE_DIR}/${
             lib.optionalString (!isNull cfg.directory) "${cfg.directory}/"
           }${x}.gpg";
         services = [ ];
diff --git a/modules/workspace/i3blocks/default.nix b/modules/workspace/i3blocks/default.nix
index 8ca44de..0fa76c2 100644
--- a/modules/workspace/i3blocks/default.nix
+++ b/modules/workspace/i3blocks/default.nix
@@ -10,7 +10,7 @@ in {
   secrets.email = {
     owner = "balsoft:users";
     services = [ ];
-    encrypted = "/home/balsoft/.password-store/email/balsoft@balsoft.ru.gpg";
+    encrypted = "${config.environment.sessionVariables.PASSWORD_STORE_DIR}/email/balsoft@balsoft.ru.gpg";
   };
 
   home-manager.users.balsoft = {