From 6187ea8497c266537e66f6da4ccb7dbe0b238de6 Mon Sep 17 00:00:00 2001
From: Fabian Hauser <fabian@fh2.ch>
Date: Mon, 3 Jan 2022 20:10:09 +0100
Subject: [PATCH] Keep PWD when switching into special env

---
 defaults/user-configuration/fhauser/applications/scripts.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/defaults/user-configuration/fhauser/applications/scripts.nix b/defaults/user-configuration/fhauser/applications/scripts.nix
index 67a1408..2ebe330 100644
--- a/defaults/user-configuration/fhauser/applications/scripts.nix
+++ b/defaults/user-configuration/fhauser/applications/scripts.nix
@@ -40,6 +40,7 @@ let
     set -eo pipefail
 
     # Nix shell might fail on some PWDs, so go to home
+    OLD_PWD=`pwd`
     cd $HOME
 
     ENV_NAME="$1"
@@ -57,7 +58,7 @@ let
     fi
 
     echo "Starting '$COMMAND' in env '$ENV_FILE'"
-    ${pkgs.nix}/bin/nix-shell ''${ENV_FILE} --run "$COMMAND"
+    ${pkgs.nix}/bin/nix-shell ''${ENV_FILE} --run "(cd $OLD_PWD; $COMMAND)"
   '';
 
   wsudo = with pkgs.xorg;