From 3e5346ccfd542e9abb928a7eca2e831b9c30df2e Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sat, 15 May 2021 22:15:06 +0200 Subject: better name nixImport --- flake.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'flake.nix') diff --git a/flake.nix b/flake.nix index ea3d0747..d8684703 100644 --- a/flake.nix +++ b/flake.nix @@ -29,7 +29,7 @@ inherit (builtins) attrNames attrValues elemAt toJSON isNull pathExists; inherit (nixpkgs) lib; utils = import ./utils { inherit lib; }; - inherit (utils) recImport overrideModule; + inherit (utils) nixImport overrideModule; inherit (lib) nixosSystem mkIf splitString filterAttrs listToAttrs mapAttrsToList nameValuePair concatMap composeManyExtensions mapAttrs mapAttrs' recursiveUpdate genAttrs unique elem optionalAttrs; accountUserName = accountName: @@ -109,7 +109,7 @@ activateNixosConfigurations = forAllSystems (system: _pkgs: mapAttrs' (hostName: nixosConfig: nameValuePair "${hostName}-activate" { type = "app"; program = "${nixosConfig.config.system.build.toplevel}/bin/switch-to-configuration"; }) self.nixosConfigurations); - overlayPaths = recImport rec { dir = ./overlays; _import = (path: _name: dir + "/${path}"); } // { pkgs = ./pkgs; }; + overlayPaths = nixImport rec { dir = ./overlays; _import = (path: _name: dir + "/${path}"); } // { pkgs = ./pkgs; }; installerProfiles = system: let nixpkgs-path = nixpkgs.legacyPackages.${system}.path; @@ -126,16 +126,16 @@ in { nixosModules = - let modulesAttrs = recImport { dir = ./modules; }; - systemProfiles = recImport rec { dir = ./system-profiles; _import = mkSystemProfile dir; }; - users = recImport rec { dir = ./users; _import = mkUserModule dir; }; - userProfiles = forAllUsers (userName: recImport rec { dir = ./user-profiles; _import = mkUserProfile userName dir; }); - accounts = recursiveUpdate rootAccounts (recImport rec { dir = ./accounts; _import = mkAccountModule dir; }); + let modulesAttrs = nixImport { dir = ./modules; }; + systemProfiles = nixImport rec { dir = ./system-profiles; _import = mkSystemProfile dir; }; + users = nixImport rec { dir = ./users; _import = mkUserModule dir; }; + userProfiles = forAllUsers (userName: nixImport rec { dir = ./user-profiles; _import = mkUserProfile userName dir; }); + accounts = recursiveUpdate rootAccounts (nixImport rec { dir = ./accounts; _import = mkAccountModule dir; }); rootAccounts = mapAttrs' (hostName: _value: nameValuePair "root@${hostName}" ({...}: { imports = [ self.nixosModules.users.root or ({...}: { imports = defaultUserProfiles "root"; }) ]; })) self.nixosConfigurations; in modulesAttrs // { inherit systemProfiles users userProfiles accounts; }; - nixosConfigurations = optionalAttrs (!(isNull installerConfig)) { installer = installerConfig; } // recImport rec { dir = ./hosts; _import = mkNixosConfiguration [] dir; }; + nixosConfigurations = optionalAttrs (!(isNull installerConfig)) { installer = installerConfig; } // nixImport rec { dir = ./hosts; _import = mkNixosConfiguration [] dir; }; - homeManagerModules = recImport rec { dir = ./home-modules; }; + homeManagerModules = nixImport rec { dir = ./home-modules; }; overlay = import overlayPaths.pkgs; overlays = mapAttrs (_name: path: import path) overlayPaths; -- cgit v1.2.3