format with nixpkgs#nixpkgs-fmt
This commit is contained in:
parent
ddb256725e
commit
da6e3fee94
@ -15,16 +15,12 @@ let
|
|||||||
|
|
||||||
global = {
|
global = {
|
||||||
_module.args.utils = utils;
|
_module.args.utils = utils;
|
||||||
|
|
||||||
system.configurationRevision = flake.rev;
|
|
||||||
|
|
||||||
networking.hostName = self;
|
networking.hostName = self;
|
||||||
|
|
||||||
nix.package = nix.defaultPackage."${system}";
|
nix.package = nix.defaultPackage."${system}";
|
||||||
|
system.configurationRevision = flake.rev;
|
||||||
};
|
};
|
||||||
|
|
||||||
local = vimport ./. "${self}.nix";
|
local = vimport ./. "${self}.nix";
|
||||||
|
|
||||||
in
|
in
|
||||||
[
|
[
|
||||||
core
|
core
|
||||||
@ -34,4 +30,4 @@ let
|
|||||||
|
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
reqImport { dir = ./.; _import = config; }
|
reqImport { dir = ./.; _import = config; }
|
||||||
|
@ -26,9 +26,9 @@ rec {
|
|||||||
|
|
||||||
vimport = path: name: import (path + "/${name}");
|
vimport = path: name: import (path + "/${name}");
|
||||||
|
|
||||||
reqImport = {
|
reqImport =
|
||||||
dir,
|
{ dir
|
||||||
_import ? base: vimport dir (base + ".nix")
|
, _import ? base: vimport dir (base + ".nix")
|
||||||
}:
|
}:
|
||||||
mapFilterAttrs
|
mapFilterAttrs
|
||||||
(_: v: v != null)
|
(_: v: v != null)
|
||||||
|
@ -89,8 +89,7 @@ in
|
|||||||
(
|
(
|
||||||
[
|
[
|
||||||
"${pkgs.any-nix-shell}/bin/any-nix-shell zsh --info-right | source /dev/stdin"
|
"${pkgs.any-nix-shell}/bin/any-nix-shell zsh --info-right | source /dev/stdin"
|
||||||
] ++
|
] ++ source
|
||||||
source
|
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user