diff --git a/flake.nix b/flake.nix index 024aa1b..12af0b5 100644 --- a/flake.nix +++ b/flake.nix @@ -46,7 +46,6 @@ nixpkgs = nixpkgs; inputs = inputs; user = "caem"; - flakeRoot = ./.; modules = [ impermanence.nixosModules.impermanence disko.nixosModules.disko diff --git a/lib/hosts.nix b/lib/hosts.nix index 4a41eb3..cba83ac 100644 --- a/lib/hosts.nix +++ b/lib/hosts.nix @@ -6,7 +6,6 @@ inputs, modules, user, - flakeRoot, }: builtins.listToAttrs (builtins.map (host: { name = host; value = nixpkgs.lib.nixosSystem { @@ -19,7 +18,7 @@ inherit inputs; inherit lib; username = user; - rootDir = flakeRoot; + cfgPath = ../.; }; }; }) (lib.getDirsInDir ../hosts)); diff --git a/modules/nixos/core/nix.nix b/modules/nixos/core/nix.nix index 06e0340..91c53bc 100644 --- a/modules/nixos/core/nix.nix +++ b/modules/nixos/core/nix.nix @@ -1,4 +1,4 @@ -{ lib, inputs, rootDir, ... }: +{ lib, inputs, cfgPath, ... }: let /* @@ -14,7 +14,7 @@ let (file: builtins.match ".*\.nix" (builtins.toString file) != null) (lib.filesystem.listFilesRecursive ../../../overlays)); */ - c = builtins.trace "${rootDir}/overlays" null; + c = builtins.trace "${cfgPath}/overlays" null; a = builtins.trace (lib.filesystem.listFilesRecursive ./.) null; in { nix = {