diff --git a/autoload.lua b/autoload.lua
index 6187c5c..e77bd27 100644
--- a/autoload.lua
+++ b/autoload.lua
@@ -1,8 +1,13 @@
 -- ~/.config/hypr/autoload.lua
 
 -- Path to search
--- local modules = os.getenv("HOME") .. "/.config/hypr/modules"
-local modules = os.getenv("MODULES_ROOT") .. "/modules"
+local modules
+
+if os.getenv("MODULES_ROOT") then
+	modules = os.getenv("MODULES_ROOT")
+else
+	modules = os.getenv("HOME") .. "/.config/hypr/modules"
+end
 
 -- Get all files in modules dir
 local p = io.popen('find -L "' .. modules .. '" -name "*.lua" -type f | sort')
diff --git a/flake.nix b/flake.nix
index 4bf1795..ede7e6e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -62,7 +62,6 @@
     }:
       (wrappers.lib.wrapPackage {
         inherit pkgs package exePath flags;
-        env = {"MODULES_ROOT" = ./.;};
       }).overrideAttrs (old: {
         passthru = (old.passthru or {}) // {inherit runtimePackages;};
       });
@@ -74,6 +73,7 @@
       package = hypr;
       runtimePackages = defaultRuntimePkgs;
       exePath = pkgs.lib.getExe hypr;
+      env."MODULES_ROOT" = ./modules;
       flags."--config" = ./hyprland.lua;
     };
   };