diff --git a/lib/hosts.nix b/lib/hosts.nix index cba83ac..02cee0a 100644 --- a/lib/hosts.nix +++ b/lib/hosts.nix @@ -15,8 +15,7 @@ ../modules/nixos/user/${user}.nix ]; specialArgs = { - inherit inputs; - inherit lib; + inherit inputs lib; username = user; cfgPath = ../.; }; diff --git a/modules/nixos/core/nix.nix b/modules/nixos/core/nix.nix index 91c53bc..b31702e 100644 --- a/modules/nixos/core/nix.nix +++ b/modules/nixos/core/nix.nix @@ -1,21 +1,17 @@ { lib, inputs, cfgPath, ... }: let - /* importOverlays = builtins.map (overlay: import overlay { inherit lib inputs; }) (builtins.filter (file: builtins.match ".*\.nix" (builtins.toString file) != null) - (lib.filesystem.listFilesRecursive ../../../overlays)); - */ + (lib.filesystem.listFilesRecursive "${cfgPath}/overlays")); /* importOverlays = (builtins.filter (file: builtins.match ".*\.nix" (builtins.toString file) != null) (lib.filesystem.listFilesRecursive ../../../overlays)); */ - c = builtins.trace "${cfgPath}/overlays" null; - a = builtins.trace (lib.filesystem.listFilesRecursive ./.) null; in { nix = { settings = { @@ -28,13 +24,11 @@ in { experimental-features = nix-command flakes ''; }; - b = c; - d = a; nixpkgs = { config = { allowUnfree = true; }; hostPlatform = lib.mkDefault "x86_64-linux"; - overlays = []; + overlays = builtins.trace importOverlays importOverlays; }; }