Renamed the @inputs to @top. This was a misguided attempt to make a
different change, but it's going to stick, now.
Began moving packages to their own folder rather than being intermingled
with overlays
Created a local overlay that just includes my personal packages
Cleaned up some dead code
Moved to just using the raw 'imports' instead of needing to explicitly
call out the `foo = import foo.nix {};` syntax
110 lines
2.3 KiB
Nix
110 lines
2.3 KiB
Nix
{
|
|
top,
|
|
name,
|
|
extra ? { },
|
|
packages ? [ ],
|
|
overlays,
|
|
}:
|
|
|
|
(
|
|
{
|
|
config,
|
|
pkgs,
|
|
lib,
|
|
...
|
|
}:
|
|
(lib.attrsets.recursiveUpdate
|
|
{
|
|
|
|
imports = [
|
|
top.agenix.nixosModules.default
|
|
top.self.modules.nixosModule
|
|
];
|
|
|
|
nixpkgs.overlays = overlays;
|
|
|
|
greg.tailscale.enable = true;
|
|
|
|
age = {
|
|
identityPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
|
|
secrets.runner-reg = {
|
|
file = ../../secrets/gitlab/myself-${name}-runner-reg.age;
|
|
owner = "gitlab-runner";
|
|
};
|
|
};
|
|
|
|
environment.systemPackages =
|
|
with pkgs;
|
|
[
|
|
curl
|
|
gawk
|
|
git
|
|
unzip
|
|
xorriso
|
|
wget
|
|
]
|
|
++ packages;
|
|
|
|
networking = {
|
|
useHostResolvConf = pkgs.lib.mkForce false;
|
|
nameservers = [ "100.100.100.100" ];
|
|
};
|
|
|
|
nixpkgs.config.allowUnfree = true;
|
|
|
|
users.users.gitlab-runner = {
|
|
isSystemUser = true;
|
|
group = "kvm";
|
|
extraGroups = [ "kvm" ];
|
|
};
|
|
|
|
services = {
|
|
gitlab-runner = {
|
|
enable = true;
|
|
settings.concurrent = 5;
|
|
services = {
|
|
shell = {
|
|
executor = "shell";
|
|
limit = 5;
|
|
authenticationTokenConfigFile = config.age.secrets.runner-reg.path;
|
|
environmentVariables = {
|
|
EFI_DIR = "${pkgs.OVMF.fd}/FV/";
|
|
STORAGE_URL = "http://s3.thehellings.lan:9000";
|
|
};
|
|
};
|
|
};
|
|
};
|
|
resolved.enable = true;
|
|
};
|
|
|
|
systemd.services.gitlab-runner = {
|
|
wants = [
|
|
"network-online.target"
|
|
"systemd-resolved.service"
|
|
];
|
|
after = [
|
|
"network.target"
|
|
"network-online.target"
|
|
"systemd-resolved.service"
|
|
];
|
|
serviceConfig = {
|
|
DevicePolicy = lib.mkForce "auto";
|
|
PrivateDevices = false;
|
|
ProtectKernelModules = false;
|
|
DevicesAllow = [
|
|
"/dev/kvm"
|
|
"/dev/mem"
|
|
];
|
|
DynamicUser = lib.mkForce false;
|
|
User = "root";
|
|
Group = "kvm";
|
|
};
|
|
};
|
|
|
|
system.stateVersion = lib.mkForce "24.05";
|
|
}
|
|
|
|
extra
|
|
) # End of attrsets.recursiveUpdate
|
|
) # End of outter function wrapper
|