treewide: format with nixpkgs-fmt
This commit is contained in:
parent
3daa990728
commit
be4b612b23
3
extern/default.nix
vendored
3
extern/default.nix
vendored
|
@ -25,6 +25,5 @@
|
|||
];
|
||||
|
||||
# passed to all home-manager modules
|
||||
userSpecialArgs = {
|
||||
};
|
||||
userSpecialArgs = { };
|
||||
}
|
||||
|
|
45
flake.nix
45
flake.nix
|
@ -28,26 +28,27 @@
|
|||
pkgs.inputs.nixpkgs.follows = "nixos";
|
||||
};
|
||||
|
||||
outputs = inputs@{ deploy, nixos, nur, self, utils, ... }:
|
||||
let
|
||||
lib = import ./lib { inherit self nixos inputs; };
|
||||
in
|
||||
lib.mkFlake {
|
||||
inherit self;
|
||||
hosts = ./hosts;
|
||||
packages = import ./pkgs;
|
||||
suites = import ./suites;
|
||||
extern = import ./extern;
|
||||
overrides = import ./overrides;
|
||||
overlays = ./overlays;
|
||||
profiles = ./profiles;
|
||||
userProfiles = ./users/profiles;
|
||||
modules = import ./modules/module-list.nix;
|
||||
userModules = import ./users/modules/module-list.nix;
|
||||
} // {
|
||||
inherit lib;
|
||||
defaultTemplate = self.templates.flk;
|
||||
templates.flk.path = ./.;
|
||||
templates.flk.description = "flk template";
|
||||
};
|
||||
outputs = inputs@{ deploy, nixos, nur, self, utils, ... }:
|
||||
let
|
||||
lib = import ./lib { inherit self nixos inputs; };
|
||||
in
|
||||
lib.mkFlake
|
||||
{
|
||||
inherit self;
|
||||
hosts = ./hosts;
|
||||
packages = import ./pkgs;
|
||||
suites = import ./suites;
|
||||
extern = import ./extern;
|
||||
overrides = import ./overrides;
|
||||
overlays = ./overlays;
|
||||
profiles = ./profiles;
|
||||
userProfiles = ./users/profiles;
|
||||
modules = import ./modules/module-list.nix;
|
||||
userModules = import ./users/modules/module-list.nix;
|
||||
} // {
|
||||
inherit lib;
|
||||
defaultTemplate = self.templates.flk;
|
||||
templates.flk.path = ./.;
|
||||
templates.flk.description = "flk template";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -37,9 +37,9 @@ rec {
|
|||
let
|
||||
# Everything that nix flake check requires for the packages output
|
||||
filter = (n: v: with v; let platforms = meta.hydraPlatforms or meta.platforms or [ ]; in
|
||||
lib.isDerivation v && !meta.broken && builtins.elem system platforms);
|
||||
lib.isDerivation v && !meta.broken && builtins.elem system platforms);
|
||||
in
|
||||
lib.filterAttrs filter packages;
|
||||
lib.filterAttrs filter packages;
|
||||
|
||||
safeReadDir = path: lib.optionalAttrs (builtins.pathExists path) (builtins.readDir path);
|
||||
}
|
||||
|
|
|
@ -4,9 +4,9 @@ with lib;
|
|||
let
|
||||
mkHomes = host: config:
|
||||
mapAttrs' (user: v: nameValuePair "${user}@${host}" v)
|
||||
config.config.system.build.homes;
|
||||
config.config.system.build.homes;
|
||||
|
||||
hmConfigs = mapAttrs mkHomes self.nixosConfigurations;
|
||||
|
||||
in
|
||||
foldl recursiveUpdate {} (attrValues hmConfigs)
|
||||
foldl recursiveUpdate { } (attrValues hmConfigs)
|
||||
|
|
|
@ -43,7 +43,8 @@ let
|
|||
tests = nixos.lib.optionalAttrs (system == "x86_64-linux")
|
||||
(import "${self}/tests" { inherit self pkgs; });
|
||||
deployHosts = nixos.lib.filterAttrs
|
||||
(n: _: self.nixosConfigurations.${n}.config.nixpkgs.system == system) self.deploy.nodes;
|
||||
(n: _: self.nixosConfigurations.${n}.config.nixpkgs.system == system)
|
||||
self.deploy.nodes;
|
||||
deployChecks = deploy.lib.${system}.deployChecks { nodes = deployHosts; };
|
||||
in
|
||||
nixos.lib.recursiveUpdate tests deployChecks;
|
||||
|
@ -56,5 +57,5 @@ let
|
|||
};
|
||||
});
|
||||
in
|
||||
outputs // systemOutputs
|
||||
outputs // systemOutputs
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@ let
|
|||
|
||||
inputAttrs = with types; functionTo attrs;
|
||||
moduleType = with types; anything // {
|
||||
inherit (submodule {}) check;
|
||||
inherit (submodule { }) check;
|
||||
description = "valid module";
|
||||
};
|
||||
in
|
||||
|
@ -36,7 +36,7 @@ let
|
|||
check = builtins.isFunction;
|
||||
description = "Nixpkgs overlay";
|
||||
};
|
||||
default = (final: prev: {});
|
||||
default = (final: prev: { });
|
||||
defaultText = "(final: prev: {})";
|
||||
description = ''
|
||||
Overlay for custom packages that will be included in treewide 'pkgs'.
|
||||
|
@ -47,7 +47,7 @@ let
|
|||
};
|
||||
modules = mkOption {
|
||||
type = listOf moduleType;
|
||||
default = [];
|
||||
default = [ ];
|
||||
apply = dev.pathsToImportedAttrs;
|
||||
description = ''
|
||||
list of modules to include in confgurations and export in 'nixosModules' output
|
||||
|
@ -55,7 +55,7 @@ let
|
|||
};
|
||||
userModules = mkOption {
|
||||
type = listOf moduleType;
|
||||
default = [];
|
||||
default = [ ];
|
||||
apply = dev.pathsToImportedAttrs;
|
||||
description = ''
|
||||
list of modules to include in home-manager configurations and export in
|
||||
|
@ -78,7 +78,7 @@ let
|
|||
};
|
||||
suites =
|
||||
let
|
||||
defaults = { user = {}; system = {}; };
|
||||
defaults = { user = { }; system = { }; };
|
||||
in
|
||||
mkOption {
|
||||
type = inputAttrs;
|
||||
|
@ -107,8 +107,11 @@ let
|
|||
extern =
|
||||
let
|
||||
defaults = {
|
||||
modules = []; overlays = []; specialArgs = {};
|
||||
userModules = []; userSpecialArgs = {};
|
||||
modules = [ ];
|
||||
overlays = [ ];
|
||||
specialArgs = { };
|
||||
userModules = [ ];
|
||||
userSpecialArgs = { };
|
||||
};
|
||||
in
|
||||
mkOption {
|
||||
|
@ -138,7 +141,7 @@ let
|
|||
};
|
||||
overrides = mkOption rec {
|
||||
type = attrs;
|
||||
default = { modules = []; disabledModules = []; packages = _: _: _: {}; };
|
||||
default = { modules = [ ]; disabledModules = [ ]; packages = _: _: _: { }; };
|
||||
defaultText = "{ modules = []; disabledModules = []; packages = {}; }";
|
||||
apply = x: default // x;
|
||||
description = "attrset of packages and modules that will be pulled from nixpkgs master";
|
||||
|
@ -146,6 +149,6 @@ let
|
|||
};
|
||||
};
|
||||
in
|
||||
nixos.lib.evalModules {
|
||||
modules = [ argOpts args ];
|
||||
}
|
||||
nixos.lib.evalModules {
|
||||
modules = [ argOpts args ];
|
||||
}
|
||||
|
|
|
@ -92,7 +92,7 @@ lib.runTests {
|
|||
system = {
|
||||
bar = [ profiles.foo.default ];
|
||||
allProfiles = [ profiles.foo.default profiles.t.default ];
|
||||
allUsers = [];
|
||||
allUsers = [ ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
|
|
@ -1 +1 @@
|
|||
[]
|
||||
[ ]
|
||||
|
|
Loading…
Reference in a new issue