fix hydra networking and remove unused hydra config files
This commit is contained in:
parent
dc83848eb0
commit
fa9e81589b
7 changed files with 4 additions and 74 deletions
|
@ -1,7 +0,0 @@
|
||||||
{ nixpkgs, declInput, projectName, ... }:
|
|
||||||
let
|
|
||||||
pkgs = import nixpkgs { };
|
|
||||||
in
|
|
||||||
{
|
|
||||||
jobsets = import ./jobsets.nix { inherit pkgs declInput projectName; };
|
|
||||||
}
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ self, nixpkgs, flake-utils, ... }:
|
{ self, nixpkgs, ... }:
|
||||||
(nixpkgs.lib.mapAttrs'
|
(nixpkgs.lib.mapAttrs'
|
||||||
(name: config: nixpkgs.lib.nameValuePair name config.config.system.build.toplevel)
|
(name: config: nixpkgs.lib.nameValuePair name config.config.system.build.toplevel)
|
||||||
self.nixosConfigurations
|
self.nixosConfigurations
|
||||||
|
|
27
jobsets.nix
27
jobsets.nix
|
@ -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
|
|
||||||
''
|
|
|
@ -278,7 +278,7 @@ in
|
||||||
networkConfig.IPv6AcceptRA = false;
|
networkConfig.IPv6AcceptRA = false;
|
||||||
linkConfig.RequiredForOnline = false;
|
linkConfig.RequiredForOnline = false;
|
||||||
routes = [
|
routes = [
|
||||||
{ routeConfig = { Gateway = "10.3.3.1"; Destination = "10.3.3.3/32"; }; }
|
{ routeConfig = { Destination = "10.3.3.1/24"; }; }
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
"10-uwu" = {
|
"10-uwu" = {
|
||||||
|
@ -310,6 +310,7 @@ in
|
||||||
PublicKey = "KzL+PKlv4LktIqqTqC9Esw8dkSZN2qSn/vq76UHbOlY=";
|
PublicKey = "KzL+PKlv4LktIqqTqC9Esw8dkSZN2qSn/vq76UHbOlY=";
|
||||||
AllowedIPs = [ "10.3.3.1/32" ];
|
AllowedIPs = [ "10.3.3.1/32" ];
|
||||||
PersistentKeepalive = 25;
|
PersistentKeepalive = 25;
|
||||||
|
Endpoint = "surgat.dadada.li:51235";
|
||||||
};
|
};
|
||||||
}];
|
}];
|
||||||
};
|
};
|
||||||
|
|
|
@ -89,10 +89,7 @@ in
|
||||||
linkConfig.RequiredForOnline = "no";
|
linkConfig.RequiredForOnline = "no";
|
||||||
routes = [
|
routes = [
|
||||||
{
|
{
|
||||||
routeConfig = {
|
routeConfig = { Destination = "10.3.3.0/24"; };
|
||||||
Gateway = "10.3.3.3";
|
|
||||||
Destination = "10.3.3.3/24";
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
@ -111,7 +108,6 @@ in
|
||||||
wireguardPeerConfig = {
|
wireguardPeerConfig = {
|
||||||
PublicKey = "Kw2HVRb1zeA7NAzBvI3UzmOj45VqM358EBuZWdlAUDE=";
|
PublicKey = "Kw2HVRb1zeA7NAzBvI3UzmOj45VqM358EBuZWdlAUDE=";
|
||||||
AllowedIPs = [ "10.3.3.3/32" ];
|
AllowedIPs = [ "10.3.3.3/32" ];
|
||||||
PersistentKeepalive = 25;
|
|
||||||
};
|
};
|
||||||
}];
|
}];
|
||||||
};
|
};
|
||||||
|
|
17
outputs.nix
17
outputs.nix
|
@ -32,23 +32,6 @@
|
||||||
|
|
||||||
formatter = pkgs.nixpkgs-fmt;
|
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; } // {
|
packages = import ./pkgs { inherit pkgs; } // {
|
||||||
installer-iso = self.nixosConfigurations.installer.config.system.build.isoImage;
|
installer-iso = self.nixosConfigurations.installer.config.system.build.isoImage;
|
||||||
};
|
};
|
||||||
|
|
16
spec.json
16
spec.json
|
@ -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"}
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Add table
Add a link
Reference in a new issue