mirror of
https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git
synced 2025-01-09 17:29:31 +00:00
just-nixos => sp-nixos; selfprivacy/current-config-source; add formatter
This commit is contained in:
parent
e656719ebd
commit
f33fb9e9bf
|
@ -6,6 +6,7 @@
|
||||||
|
|
||||||
selfprivacy-graphql-api.url =
|
selfprivacy-graphql-api.url =
|
||||||
"git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git";
|
"git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git";
|
||||||
|
# make selfprivacy-graphql-api use the same shared nixpkgs
|
||||||
selfprivacy-graphql-api.inputs.nixpkgs.follows = "nixpkgs";
|
selfprivacy-graphql-api.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -21,7 +22,7 @@
|
||||||
lib = nixpkgs.legacyPackages.${system}.lib;
|
lib = nixpkgs.legacyPackages.${system}.lib;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
just-nixos = nixpkgs.lib.nixosSystem {
|
sp-nixos = nixpkgs.lib.nixosSystem {
|
||||||
specialArgs = { inherit system; };
|
specialArgs = { inherit system; };
|
||||||
modules = [
|
modules = [
|
||||||
hardware-configuration
|
hardware-configuration
|
||||||
|
@ -31,7 +32,7 @@
|
||||||
selfprivacy-graphql-api.packages.${system}.default)
|
selfprivacy-graphql-api.packages.${system}.default)
|
||||||
{
|
{
|
||||||
# embed top-level flake source folder into the build
|
# embed top-level flake source folder into the build
|
||||||
environment.etc."selfprivacy-config-source".source =
|
environment.etc."selfprivacy/current-config-source".source =
|
||||||
top-level-flake.outPath;
|
top-level-flake.outPath;
|
||||||
# for running "nix search nixpkgs", etc
|
# for running "nix search nixpkgs", etc
|
||||||
nix.registry.nixpkgs.flake = nixpkgs;
|
nix.registry.nixpkgs.flake = nixpkgs;
|
||||||
|
@ -53,9 +54,9 @@
|
||||||
sp-module.configPathsNeeded));
|
sp-module.configPathsNeeded));
|
||||||
}))
|
}))
|
||||||
)
|
)
|
||||||
# (sp-module: sp-module.nixosModules.default)
|
|
||||||
(lib.attrsets.attrValues sp-modules);
|
(lib.attrsets.attrValues sp-modules);
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue