From fa9e81589bacb3d013f3f6f2a1c5aa6c2db2aef1 Mon Sep 17 00:00:00 2001
From: dadada <dadada@dadada.li>
Date: Sun, 25 Jun 2023 21:35:31 +0200
Subject: [PATCH] fix hydra networking and remove unused hydra config files

---
 default.nix                     |  7 -------
 hydra-jobs.nix                  |  2 +-
 jobsets.nix                     | 27 ---------------------------
 nixos/ninurta/configuration.nix |  3 ++-
 nixos/surgat/configuration.nix  |  6 +-----
 outputs.nix                     | 17 -----------------
 spec.json                       | 16 ----------------
 7 files changed, 4 insertions(+), 74 deletions(-)
 delete mode 100644 default.nix
 delete mode 100644 jobsets.nix
 delete mode 100644 spec.json

diff --git a/default.nix b/default.nix
deleted file mode 100644
index 0bd1bf9..0000000
--- a/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ nixpkgs, declInput, projectName, ... }:
-let
-  pkgs = import nixpkgs { };
-in
-{
-  jobsets = import ./jobsets.nix { inherit pkgs declInput projectName; };
-}
diff --git a/hydra-jobs.nix b/hydra-jobs.nix
index 86205e7..1d7dde7 100644
--- a/hydra-jobs.nix
+++ b/hydra-jobs.nix
@@ -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
diff --git a/jobsets.nix b/jobsets.nix
deleted file mode 100644
index a869a03..0000000
--- a/jobsets.nix
+++ /dev/null
@@ -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
-''
diff --git a/nixos/ninurta/configuration.nix b/nixos/ninurta/configuration.nix
index 65ae5de..b198253 100644
--- a/nixos/ninurta/configuration.nix
+++ b/nixos/ninurta/configuration.nix
@@ -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";
           };
         }];
       };
diff --git a/nixos/surgat/configuration.nix b/nixos/surgat/configuration.nix
index a3b750c..b2bed8b 100644
--- a/nixos/surgat/configuration.nix
+++ b/nixos/surgat/configuration.nix
@@ -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;
           };
         }];
       };
diff --git a/outputs.nix b/outputs.nix
index 90e3305..6f2a1a2 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -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;
     };
diff --git a/spec.json b/spec.json
deleted file mode 100644
index a2a3a43..0000000
--- a/spec.json
+++ /dev/null
@@ -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"}
-        }
-}