lelgenio/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 2 Releases Packages Wiki Activity Actions

monolith: cleanup host-specific modules

Browse source
This commit is contained in:
Leonardo Eugênio 2026-02-24 14:22:16 -03:00
parent 52f5d725ea
commit 5adec3b1d3
5 changed files with 12 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

3
flake.nix
View file

@ -125,9 +125,6 @@
inherit specialArgs; inherit specialArgs;
modules = common_modules ++ [ modules = common_modules ++ [
./hosts/monolith ./hosts/monolith
./system/monolith-gitlab-runner.nix
./system/monolith-forgejo-runner.nix
./system/nix-serve.nix
]; ];
}; };
double-rainbow = lib.nixosSystem { double-rainbow = lib.nixosSystem {

2
hosts/monolith/default.nix
View file

@ -27,6 +27,8 @@ in
./factorio-server.nix ./factorio-server.nix
./nebula-vpn.nix ./nebula-vpn.nix
./minio.nix ./minio.nix
./monolith-forgejo-runner.nix
./monolith-gitlab-runner.nix
]; ];
boot.initrd.availableKernelModules = [ boot.initrd.availableKernelModules = [
"nvme" "nvme"

0
system/monolith-forgejo-runner.nix → hosts/monolith/monolith-forgejo-runner.nix
View file

29
system/monolith-gitlab-runner.nix → hosts/monolith/monolith-gitlab-runner.nix
View file

@ -5,7 +5,10 @@
... ...
}: }:
let let
inherit (pkgs.callPackage ./gitlab-runner.nix { inherit inputs; }) mkNixRunner mkNixRunnerFull; inherit (pkgs.callPackage ../../system/gitlab-runner.nix { inherit inputs; })
mkNixRunner
mkNixRunnerFull
;
in in
{ {
boot.kernel.sysctl."net.ipv4.ip_forward" = true; boot.kernel.sysctl."net.ipv4.ip_forward" = true;
@ -38,23 +41,11 @@ in
systemd.services.gitlab-runner.serviceConfig.Nice = 10; systemd.services.gitlab-runner.serviceConfig.Nice = 10;
sops.secrets = { sops.secrets = {
"gitlab-runners/thoreb-telemetria-nix" = { "gitlab-runners/thoreb-telemetria-nix" = { };
sopsFile = ../secrets/monolith/default.yaml; "gitlab-runners/thoreb-itinerario-nix" = { };
}; "gitlab-runners/docker-images-token" = { };
"gitlab-runners/thoreb-itinerario-nix" = { "gitlab-runners/wopus-gitlab-nix" = { };
sopsFile = ../secrets/monolith/default.yaml; "gitlab-runners/wopus-ssh-nix-cache-pk" = { };
}; "gitlab-runners/wopus-ssh-nix-cache-pub" = { };
"gitlab-runners/docker-images-token" = {
sopsFile = ../secrets/monolith/default.yaml;
};
"gitlab-runners/wopus-gitlab-nix" = {
sopsFile = ../secrets/monolith/default.yaml;
};
"gitlab-runners/wopus-ssh-nix-cache-pk" = {
sopsFile = ../secrets/monolith/default.yaml;
};
"gitlab-runners/wopus-ssh-nix-cache-pub" = {
sopsFile = ../secrets/monolith/default.yaml;
};
}; };
} }

14
system/nix-serve.nix
View file

@ -1,14 +0,0 @@
{
config,
pkgs,
lib,
...
}:
{
services.nix-serve = {
enable = true;
secretKeyFile = config.sops.secrets."nix-serve/private-key".path;
};
sops.secrets."nix-serve/private-key" = { };
}