fix hydra networking and remove unused hydra config files

This commit is contained in:
Tim Schubert 2023-06-25 21:35:31 +02:00
parent dc83848eb0
commit fa9e81589b
Signed by: dadada
GPG key ID: EEB8D1CE62C4DFEA
7 changed files with 4 additions and 74 deletions

View file

@ -1,7 +0,0 @@
{ nixpkgs, declInput, projectName, ... }:
let
pkgs = import nixpkgs { };
in
{
jobsets = import ./jobsets.nix { inherit pkgs declInput projectName; };
}

View file

@ -1,4 +1,4 @@
{ self, nixpkgs, flake-utils, ... }:
{ self, nixpkgs, ... }:
(nixpkgs.lib.mapAttrs'
(name: config: nixpkgs.lib.nameValuePair name config.config.system.build.toplevel)
self.nixosConfigurations

View file

@ -1,27 +0,0 @@
{ pkgs
, declInput
, projectName
, ...
}:
pkgs.runCommand "spec.json" { } ''
cat <<EOF
${builtins.toXML declInput}
EOF
cat > $out <<EOF
{
"main": {
"enabled": 1,
"hidden": false,
"description": "${projectName}",
"flakeuri": "github:dadada/nix-config/main",
"checkinterval": 300,
"schedulingshares": 1,
"enableemail": false,
"emailoverride": "",
"keepnr": 3,
"type": "flake",
"inputs": ${builtins.toJSON declInput}
}
}
EOF
''

View file

@ -278,7 +278,7 @@ in
networkConfig.IPv6AcceptRA = false;
linkConfig.RequiredForOnline = false;
routes = [
{ routeConfig = { Gateway = "10.3.3.1"; Destination = "10.3.3.3/32"; }; }
{ routeConfig = { Destination = "10.3.3.1/24"; }; }
];
};
"10-uwu" = {
@ -310,6 +310,7 @@ in
PublicKey = "KzL+PKlv4LktIqqTqC9Esw8dkSZN2qSn/vq76UHbOlY=";
AllowedIPs = [ "10.3.3.1/32" ];
PersistentKeepalive = 25;
Endpoint = "surgat.dadada.li:51235";
};
}];
};

View file

@ -89,10 +89,7 @@ in
linkConfig.RequiredForOnline = "no";
routes = [
{
routeConfig = {
Gateway = "10.3.3.3";
Destination = "10.3.3.3/24";
};
routeConfig = { Destination = "10.3.3.0/24"; };
}
];
};
@ -111,7 +108,6 @@ in
wireguardPeerConfig = {
PublicKey = "Kw2HVRb1zeA7NAzBvI3UzmOj45VqM358EBuZWdlAUDE=";
AllowedIPs = [ "10.3.3.3/32" ];
PersistentKeepalive = 25;
};
}];
};

View file

@ -32,23 +32,6 @@
formatter = pkgs.nixpkgs-fmt;
jobsets = (import ./jobsets.nix {
inherit pkgs;
projectName = "nix-config";
declInput = {
src = {
type = "git";
value = "git://github.com/dadada/nix-config.git main";
emailresponsible = false;
};
nixpkgs = {
type = "git";
value = "git://github.com/NixOS/nixpkgs.git nixpkgs-22.11";
emailresponsible = false;
};
};
});
packages = import ./pkgs { inherit pkgs; } // {
installer-iso = self.nixosConfigurations.installer.config.system.build.isoImage;
};

View file

@ -1,16 +0,0 @@
{
"enabled": 1,
"hidden": false,
"description": "nix-config Jobsets",
"nixexprinput": "src",
"nixexprpath": "default.nix",
"checkinterval": 300,
"schedulingshares": 1,
"enableemail": false,
"emailoverride": "",
"keepnr": 3,
"inputs": {
"nixpkgs":{"emailresponsible":false,"type":"git","value":"https://github.com/NixOS/nixpkgs.git nixpkgs-22.05"},
"src":{"emailresponsible":false,"type":"git","value":"https://github.com/dadada/nix-config.git main"}
}
}