fixed modules_root misassignment and added fallback, made overridable in flake
This commit is contained in:
@@ -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')
|
||||
|
||||
@@ -59,10 +59,10 @@
|
||||
runtimePackages,
|
||||
exePath,
|
||||
flags,
|
||||
env,
|
||||
}:
|
||||
(wrappers.lib.wrapPackage {
|
||||
inherit pkgs package exePath flags;
|
||||
env = {"MODULES_ROOT" = ./.;};
|
||||
inherit env pkgs package exePath flags;
|
||||
}).overrideAttrs (old: {
|
||||
passthru = (old.passthru or {}) // {inherit runtimePackages;};
|
||||
});
|
||||
@@ -74,6 +74,7 @@
|
||||
package = hypr;
|
||||
runtimePackages = defaultRuntimePkgs;
|
||||
exePath = pkgs.lib.getExe hypr;
|
||||
env."MODULES_ROOT" = ./modules;
|
||||
flags."--config" = ./hyprland.lua;
|
||||
};
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user