Luj/snowfield
1
0
Fork 0
mirror of https://github.com/JulienMalka/snowfield.git synced 2025-04-04 03:01:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed my knowledge about attribute set merging

Browse source
This commit is contained in:
Julien Malka 2021-12-29 18:20:42 +01:00
parent be4fce11f4
commit 698ddcc02a
No known key found for this signature in database
GPG key ID: 3C68E13964FEA07F
5 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
machines/newton/default.nix
View file

@ -12,7 +12,10 @@ in
]; ];
luj = { luj = {
filerun.enable = true; filerun = {
enable = true;
subdomain = "cloud";
};
zfs-mails.enable = true; zfs-mails.enable = true;
}; };

4
modules/bincache/default.nix
View file

@ -13,7 +13,7 @@ with lib;
}; };
config = mkIf cfg.enable config = mkIf cfg.enable (recursiveUpdate
{ {
users.users.nix-serve = { users.users.nix-serve = {
isSystemUser = true; isSystemUser = true;
@ -32,5 +32,5 @@ with lib;
port = port; port = port;
}; };
} // mkSubdomain cfg.subdomain port; } (mkSubdomain cfg.subdomain port));
} }

4
modules/drone/default.nix
View file

@ -14,7 +14,7 @@ in
}; };
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable (recursiveUpdate {
users.users.drone = { users.users.drone = {
isNormalUser = true; isNormalUser = true;
@ -93,5 +93,5 @@ in
path = [ pkgs.nixUnstable pkgs.git pkgs.openssh ]; path = [ pkgs.nixUnstable pkgs.git pkgs.openssh ];
}; };
} // mkSubdomain cfg.subdomain port; } (mkSubdomain cfg.subdomain port));
} }

4
modules/filerun/default.nix
View file

@ -15,7 +15,7 @@ in
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable (recursiveUpdate {
sops.secrets.filerun = {}; sops.secrets.filerun = {};
@ -83,6 +83,6 @@ in
extraOptions = [ "--network=filerun-br" ]; extraOptions = [ "--network=filerun-br" ];
}; };
} // mkSubdomain cfg.subdomain port; } (mkSubdomain cfg.subdomain port));
} }

4
modules/hydra/default.nix
View file

@ -28,9 +28,9 @@ in
networking.firewall = { allowedTCPPorts = [ port ]; }; networking.firewall = { allowedTCPPorts = [ port ]; };
} }
(mkIf cfg.nginx.enable { (mkIf cfg.nginx.enable (recursiveUpdate {
services.hydra.hydraURL = "${cfg.nginx.subdomain}.julienmalka.me"; services.hydra.hydraURL = "${cfg.nginx.subdomain}.julienmalka.me";
} // mkSubdomain cfg.nginx.subdomain port )]); } (mkSubdomain cfg.nginx.subdomain port)) )]);