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
|
# passed to all home-manager modules
|
||||||
userSpecialArgs = {
|
userSpecialArgs = { };
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
@ -32,7 +32,8 @@
|
|||||||
let
|
let
|
||||||
lib = import ./lib { inherit self nixos inputs; };
|
lib = import ./lib { inherit self nixos inputs; };
|
||||||
in
|
in
|
||||||
lib.mkFlake {
|
lib.mkFlake
|
||||||
|
{
|
||||||
inherit self;
|
inherit self;
|
||||||
hosts = ./hosts;
|
hosts = ./hosts;
|
||||||
packages = import ./pkgs;
|
packages = import ./pkgs;
|
||||||
|
@ -9,4 +9,4 @@ let
|
|||||||
hmConfigs = mapAttrs mkHomes self.nixosConfigurations;
|
hmConfigs = mapAttrs mkHomes self.nixosConfigurations;
|
||||||
|
|
||||||
in
|
in
|
||||||
foldl recursiveUpdate {} (attrValues hmConfigs)
|
foldl recursiveUpdate { } (attrValues hmConfigs)
|
||||||
|
@ -43,7 +43,8 @@ let
|
|||||||
tests = nixos.lib.optionalAttrs (system == "x86_64-linux")
|
tests = nixos.lib.optionalAttrs (system == "x86_64-linux")
|
||||||
(import "${self}/tests" { inherit self pkgs; });
|
(import "${self}/tests" { inherit self pkgs; });
|
||||||
deployHosts = nixos.lib.filterAttrs
|
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; };
|
deployChecks = deploy.lib.${system}.deployChecks { nodes = deployHosts; };
|
||||||
in
|
in
|
||||||
nixos.lib.recursiveUpdate tests deployChecks;
|
nixos.lib.recursiveUpdate tests deployChecks;
|
||||||
@ -56,5 +57,5 @@ let
|
|||||||
};
|
};
|
||||||
});
|
});
|
||||||
in
|
in
|
||||||
outputs // systemOutputs
|
outputs // systemOutputs
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@ let
|
|||||||
|
|
||||||
inputAttrs = with types; functionTo attrs;
|
inputAttrs = with types; functionTo attrs;
|
||||||
moduleType = with types; anything // {
|
moduleType = with types; anything // {
|
||||||
inherit (submodule {}) check;
|
inherit (submodule { }) check;
|
||||||
description = "valid module";
|
description = "valid module";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
@ -36,7 +36,7 @@ let
|
|||||||
check = builtins.isFunction;
|
check = builtins.isFunction;
|
||||||
description = "Nixpkgs overlay";
|
description = "Nixpkgs overlay";
|
||||||
};
|
};
|
||||||
default = (final: prev: {});
|
default = (final: prev: { });
|
||||||
defaultText = "(final: prev: {})";
|
defaultText = "(final: prev: {})";
|
||||||
description = ''
|
description = ''
|
||||||
Overlay for custom packages that will be included in treewide 'pkgs'.
|
Overlay for custom packages that will be included in treewide 'pkgs'.
|
||||||
@ -47,7 +47,7 @@ let
|
|||||||
};
|
};
|
||||||
modules = mkOption {
|
modules = mkOption {
|
||||||
type = listOf moduleType;
|
type = listOf moduleType;
|
||||||
default = [];
|
default = [ ];
|
||||||
apply = dev.pathsToImportedAttrs;
|
apply = dev.pathsToImportedAttrs;
|
||||||
description = ''
|
description = ''
|
||||||
list of modules to include in confgurations and export in 'nixosModules' output
|
list of modules to include in confgurations and export in 'nixosModules' output
|
||||||
@ -55,7 +55,7 @@ let
|
|||||||
};
|
};
|
||||||
userModules = mkOption {
|
userModules = mkOption {
|
||||||
type = listOf moduleType;
|
type = listOf moduleType;
|
||||||
default = [];
|
default = [ ];
|
||||||
apply = dev.pathsToImportedAttrs;
|
apply = dev.pathsToImportedAttrs;
|
||||||
description = ''
|
description = ''
|
||||||
list of modules to include in home-manager configurations and export in
|
list of modules to include in home-manager configurations and export in
|
||||||
@ -78,7 +78,7 @@ let
|
|||||||
};
|
};
|
||||||
suites =
|
suites =
|
||||||
let
|
let
|
||||||
defaults = { user = {}; system = {}; };
|
defaults = { user = { }; system = { }; };
|
||||||
in
|
in
|
||||||
mkOption {
|
mkOption {
|
||||||
type = inputAttrs;
|
type = inputAttrs;
|
||||||
@ -107,8 +107,11 @@ let
|
|||||||
extern =
|
extern =
|
||||||
let
|
let
|
||||||
defaults = {
|
defaults = {
|
||||||
modules = []; overlays = []; specialArgs = {};
|
modules = [ ];
|
||||||
userModules = []; userSpecialArgs = {};
|
overlays = [ ];
|
||||||
|
specialArgs = { };
|
||||||
|
userModules = [ ];
|
||||||
|
userSpecialArgs = { };
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
mkOption {
|
mkOption {
|
||||||
@ -138,7 +141,7 @@ let
|
|||||||
};
|
};
|
||||||
overrides = mkOption rec {
|
overrides = mkOption rec {
|
||||||
type = attrs;
|
type = attrs;
|
||||||
default = { modules = []; disabledModules = []; packages = _: _: _: {}; };
|
default = { modules = [ ]; disabledModules = [ ]; packages = _: _: _: { }; };
|
||||||
defaultText = "{ modules = []; disabledModules = []; packages = {}; }";
|
defaultText = "{ modules = []; disabledModules = []; packages = {}; }";
|
||||||
apply = x: default // x;
|
apply = x: default // x;
|
||||||
description = "attrset of packages and modules that will be pulled from nixpkgs master";
|
description = "attrset of packages and modules that will be pulled from nixpkgs master";
|
||||||
@ -146,6 +149,6 @@ let
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
nixos.lib.evalModules {
|
nixos.lib.evalModules {
|
||||||
modules = [ argOpts args ];
|
modules = [ argOpts args ];
|
||||||
}
|
}
|
||||||
|
@ -92,7 +92,7 @@ lib.runTests {
|
|||||||
system = {
|
system = {
|
||||||
bar = [ profiles.foo.default ];
|
bar = [ profiles.foo.default ];
|
||||||
allProfiles = [ profiles.foo.default profiles.t.default ];
|
allProfiles = [ profiles.foo.default profiles.t.default ];
|
||||||
allUsers = [];
|
allUsers = [ ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -0,0 +1 @@
|
|||||||
|
|
@ -1 +1 @@
|
|||||||
[]
|
[ ]
|
||||||
|
Loading…
Reference in New Issue
Block a user