gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(ci): overlays output

Browse source
This commit is contained in:
arcnmx 2024-04-07 16:27:40 -07:00
parent 3c19a00aaa
commit 5658105812
6 changed files with 39 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib.nix
View file

@ -87,6 +87,7 @@ in {
gensokyo-zone = { gensokyo-zone = {
inherit inputs; inherit inputs;
inherit (inputs) self; inherit (inputs) self;
inherit (inputs.self) overlays;
inherit (inputs.self.lib) tree meta lib systems; inherit (inputs.self.lib) tree meta lib systems;
}; };
generate = import ./generate.nix {inherit inputs tree;}; generate = import ./generate.nix {inherit inputs tree;};

5
modules/extern/nixos/krb5.nix vendored
View file

@ -338,6 +338,11 @@ in {
}; };
config = { config = {
nixpkgs = mkIf cfg.enable {
overlays = [
gensokyo-zone.overlays.krb5
];
};
security = { security = {
krb5 = mkIf cfg.enable (unmerged.merge cfg.set.krb5Settings); krb5 = mkIf cfg.enable (unmerged.merge cfg.set.krb5Settings);
ipa = mkIf cfg.enable (unmerged.merge cfg.set.ipaSettings); ipa = mkIf cfg.enable (unmerged.merge cfg.set.ipaSettings);

9
nixos/base/nixpkgs.nix
View file

@ -1,11 +1,10 @@
{inputs, ...}: { {inputs, ...}: let
inherit (inputs.self) overlays;
in {
nixpkgs = { nixpkgs = {
overlays = [ overlays = [
inputs.arcexprs.overlays.default inputs.arcexprs.overlays.default
(import ../../overlays/barcodebuddy.nix) overlays.default
(import ../../overlays/samba.nix)
(import ../../overlays/nginx.nix)
(import ../../overlays/krb5.nix)
]; ];
config = { config = {
allowUnfree = true; allowUnfree = true;

13
outputs.nix
View file

@ -14,7 +14,17 @@
devShells = import ./devShells.nix {inherit system inputs;}; devShells = import ./devShells.nix {inherit system inputs;};
packages = import ./packages {inherit system inputs;}; packages = import ./packages {inherit system inputs;};
legacyPackages = { legacyPackages = {
inherit (import ./overlays {inherit system inputs;}) pkgs; pkgs = import inputs.nixpkgs {
inherit system;
overlays = [
inputs.self.overlays.default
inputs.self.overlays.deploy-rs
inputs.self.overlays.arc
];
config = {
allowUnfree = true;
};
};
patchedNixpkgs = pkgs.applyPatches { patchedNixpkgs = pkgs.applyPatches {
name = "nixpkgs"; name = "nixpkgs";
src = inputs.nixpkgs; src = inputs.nixpkgs;
@ -50,6 +60,7 @@
in { in {
inherit (outputs) devShells legacyPackages packages checks; inherit (outputs) devShells legacyPackages packages checks;
inherit (systems) deploy nixosConfigurations; inherit (systems) deploy nixosConfigurations;
inherit (tree.impure) overlays;
nixosModules = treeToModulesOutput tree.impure.modules.extern.nixos; nixosModules = treeToModulesOutput tree.impure.modules.extern.nixos;
homeModules = treeToModulesOutput tree.impure.modules.extern.home; homeModules = treeToModulesOutput tree.impure.modules.extern.home;
miscModules = treeToModulesOutput tree.impure.modules.extern.misc; miscModules = treeToModulesOutput tree.impure.modules.extern.misc;

43
overlays/default.nix
View file

@ -1,32 +1,19 @@
{ {
inputs, inputs,
system, ...
}: { }: let
pkgs = import inputs.nixpkgs { inherit (inputs.self.lib) nixlib;
inherit system; in rec {
overlays = [ default = nixlib.composeManyExtensions [
inputs.deploy-rs.overlays.default or inputs.deploy-rs.overlay barcodebuddy
inputs.arcexprs.overlays.default krb5
(import ./barcodebuddy.nix) nginx
(import ./samba.nix) samba
(import ./nginx.nix)
(import ./krb5.nix)
(final: prev: {
jemalloc =
if final.hostPlatform != "aarch64-darwin"
then prev.jemalloc
else null;
})
]; ];
config = { barcodebuddy = import ./barcodebuddy.nix;
allowUnfree = true; krb5 = import ./krb5.nix;
allowBroken = true; nginx = import ./nginx.nix;
allowUnsupportedSystem = false; samba = import ./samba.nix;
permittedInsecurePackages = [ deploy-rs = inputs.deploy-rs.overlays.default or inputs.deploy-rs.overlay;
"ffmpeg-3.4.8" arc = inputs.arcexprs.overlays.default;
"ffmpeg-2.8.17"
"openssl-1.1.1w"
];
};
};
} }

6
tree.nix
View file

@ -77,10 +77,6 @@
"nixos/*".functor = { "nixos/*".functor = {
enable = true; enable = true;
}; };
"hardware".evaluateDefault = true; "overlays".evaluateDefault = true;
"nixos/cross".evaluateDefault = true;
"hardware/*".evaluateDefault = true;
"home".evaluateDefault = true;
"home/*".functor.enable = true;
}; };
}) })