diff --git a/.envrc b/.envrc
index 604dd135d..6dff70de7 100644
--- a/.envrc
+++ b/.envrc
@@ -1,36 +1,4 @@
 # SPDX-FileCopyrightText: 2014-2023 Institute for Automation of Complex Power Systems, RWTH Aachen University
 # SPDX-License-Identifier: Apache-2.0
 
-export_or_unset()
-{
-	local var=$1
-
-	if [ -z "${!var+x}" ]; then
-		return
-	fi
-
-	if [ -n "$2" ]; then
-		export $var="$2"
-	else
-		unset $var
-	fi
-
-}
-
-if direnv_version "2.30.0" \
-&& has nix \
-&& nix show-config experimental-features 2>/dev/null | grep -wqF flakes
-then
-	local oldtmp="$TMP"
-	local oldtemp="$TEMP"
-	local oldtmpdir="$TMPDIR"
-	local oldtempdir="$TEMPDIR"
-
-	watch_file ./packaging/nix/*.nix
-	use flake ./packaging/nix
-
-	export_or_unset TMP "$oldtmp"
-	export_or_unset TEMP "$oldtemp"
-	export_or_unset TMPDIR "$oldtmpdir"
-	export_or_unset TEMPDIR "$oldtempdir"
-fi
+use flake
diff --git a/packaging/nix/flake.lock b/flake.lock
similarity index 100%
rename from packaging/nix/flake.lock
rename to flake.lock
diff --git a/packaging/nix/flake.nix b/flake.nix
similarity index 91%
rename from packaging/nix/flake.nix
rename to flake.nix
index 564007e78..e4a56cb1d 100644
--- a/packaging/nix/flake.nix
+++ b/flake.nix
@@ -49,6 +49,8 @@
   } @ inputs: let
     inherit (nixpkgs) lib;
 
+    nixDir = ./packaging/nix;
+
     # Add separateDebugInfo to a derivation
     addSeparateDebugInfo = d:
       d.overrideAttrs {
@@ -97,12 +99,12 @@
     packagesWith = pkgs: rec {
       default = villas;
 
-      villas-python = pkgs.callPackage ./python.nix {
-        src = ../../python;
+      villas-python = pkgs.callPackage (nixDir + "/python.nix") {
+        src = ./python;
       };
 
-      villas-minimal = pkgs.callPackage ./villas.nix {
-        src = ../..;
+      villas-minimal = pkgs.callPackage (nixDir + "/villas.nix") {
+        src = ./.;
         version = "minimal";
         inherit (inputs) fpga common;
       };
@@ -115,19 +117,19 @@
         withAllNodes = true;
       };
 
-      ethercat = pkgs.callPackage ./ethercat.nix {
+      ethercat = pkgs.callPackage (nixDir + "/ethercat.nix") {
         src = inputs.ethercat;
       };
 
-      lib60870 = pkgs.callPackage ./lib60870.nix {
+      lib60870 = pkgs.callPackage (nixDir + "/lib60870.nix") {
         src = inputs.lib60870;
       };
 
-      libdatachannel = pkgs.callPackage ./libdatachannel.nix {
+      libdatachannel = pkgs.callPackage (nixDir + "/libdatachannel.nix") {
         src = inputs.libdatachannel;
       };
 
-      libiec61850 = pkgs.callPackage ./libiec61850.nix {
+      libiec61850 = pkgs.callPackage (nixDir + "/libiec61850.nix") {
         src = inputs.libiec61850;
       };
     };