From e58a90f04c0a4eaec93aec170aa1b973c44b4069 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Sat, 9 Jul 2022 18:11:21 +0200
Subject: [PATCH] Fix environment not being loaded into systemd user session
 anymore

---
 modules/base/default.nix           | 1 +
 modules/graphical/mail/default.nix | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/base/default.nix b/modules/base/default.nix
index 62a01d44..2a0fc3ec 100644
--- a/modules/base/default.nix
+++ b/modules/base/default.nix
@@ -47,6 +47,7 @@
     home-manager.users = {
       charlotte = { ... }: {
         home.stateVersion = config.chvp.stateVersion;
+        systemd.user.sessionVariables = config.home-manager.users.charlotte.home.sessionVariables;
       };
       root = { ... }: {
         home.stateVersion = config.chvp.stateVersion;
diff --git a/modules/graphical/mail/default.nix b/modules/graphical/mail/default.nix
index 682d4947..d03a9e1b 100644
--- a/modules/graphical/mail/default.nix
+++ b/modules/graphical/mail/default.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 let
-  passwordScript = pkgs.writeShellScript "get_mail_password" ''${pkgs.pass}/bin/pass show "$@" | head -n1 | tr -d "\n"'';
+  passwordScript = pkgs.writeShellScript "get_mail_password" ''${pkgs.pass}/bin/pass show "$@" | ${pkgs.coreutils}/bin/head -n1 | ${pkgs.coreutils}/bin/tr -d "\n"'';
   notifyScript = name: pkgs.writeShellScript "notify_${name}_mail" ''
     unseen_count=$(${pkgs.mblaze}/bin/mlist -N ~/mail/*/INBOX | wc -l)