Compare commits

..

No commits in common. "1f8dbf6c32ad7881028397e2f664781636f02407" and "89f7debf170421002aff6bd261c0244cbe85febb" have entirely different histories.

5 changed files with 4 additions and 68 deletions

View File

@ -129,7 +129,7 @@
useUserPackages = true;
inherit users;
extraSpecialArgs = {
inherit inputs outputs vars nixpkgs home-manager;
inherit inputs outputs vars nixpkgs;
extraPkgs = mkExtraPkgs system;
};
};
@ -173,7 +173,7 @@
})
] ++ extraModules;
specialArgs = {
inherit inputs outputs vars nixpkgs home-manager;
inherit inputs outputs vars nixpkgs;
extraPkgs = mkExtraPkgs system;
};
};

View File

@ -1,8 +1,7 @@
{ pkgs, config, lib, options, osConfig ? { }, nixpkgs, home-manager, ... }@args:
{ pkgs, config, lib, options, osConfig ? { }, ... }@args:
let
isStandalone = with builtins; !( (typeOf osConfig == "set") && hasAttr "home-manager" osConfig );
cfg = config.nixfiles;
flakeType = cfg.lib.types.flake;
in
{
imports = [
@ -19,27 +18,6 @@ in
default = options;
readOnly = true;
};
lib = lib.mkOption {
description = "nixfiles library";
default = (import ../lib/nixfiles) pkgs;
readOnly = true;
};
nixpkgs = lib.mkOption {
description = "nixpkgs flake";
type = flakeType;
default = nixpkgs;
example = "inputs.nixpkgs";
};
home-manager = lib.mkOption {
description = "home-manager flake";
type = flakeType;
default = home-manager;
example = "inputs.home-manager";
};
meta.standalone = lib.mkOption {
default = isStandalone;
description = "Whether or not the home-manager installation is standalone (standalone installations don't have access to osConfig).";

View File

@ -1,7 +0,0 @@
pkgs:
let
inherit (pkgs) lib;
in
{
types = (import ./types.nix) pkgs;
}

View File

@ -1,13 +0,0 @@
pkgs:
let
inherit (pkgs) lib;
inherit (lib.types) mkOptionType;
inherit (lib.options) mergeEqualOption;
in
{
flake = mkOptionType {
name="flake";
description="Nix flake";
descriptionClass = "noun";
merge = mergeEqualOption; check = (value: value._type or "" == "flake"); };
}

View File

@ -1,7 +1,6 @@
{ pkgs, config, lib, options, nixpkgs, home-manager, ... }@args:
{ pkgs, config, lib, options, ... }@args:
let
cfg = config.nixfiles;
flakeType = cfg.lib.types.flake;
in
{
imports = [
@ -22,26 +21,5 @@ in
example = true;
type = lib.types.bool;
};
lib = lib.mkOption {
description = "nixfiles library";
default = (import ../lib/nixfiles) pkgs;
readOnly = true;
type = lib.types.attrs;
};
nixpkgs = lib.mkOption {
description = "nixpkgs flake";
default = nixpkgs;
type = flakeType;
example = "nixpkgs";
};
home-manager = lib.mkOption {
description = "home-manager flake";
default = home-manager;
type = flakeType;
example = "home-manager";
};
};
}