From 999a16501d310bd399e151a055a1c8eaa6e4ed49 Mon Sep 17 00:00:00 2001
From: catvayor <catvayor@katvayor.net>
Date: Wed, 18 Dec 2024 13:14:47 +0100
Subject: [PATCH] feat: DGNum cache

---
 machines/kat-probook/configuration.nix | 18 +++++++++++++++---
 modules/ssh.nix                        |  4 ++--
 npins/sources.json                     | 13 ++++++++++++-
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/machines/kat-probook/configuration.nix b/machines/kat-probook/configuration.nix
index 2bcb9a9..df9e884 100644
--- a/machines/kat-probook/configuration.nix
+++ b/machines/kat-probook/configuration.nix
@@ -2,8 +2,13 @@
   pkgs,
   nodes,
   users,
+  lib,
+  sources,
   ...
 }:
+let
+  inherit (lib) mkMerge;
+in
 {
   deployment.allowLocalDeployment = true;
 
@@ -32,9 +37,16 @@
     };
   };
 
-  nix.settings.trusted-users = [
-    "root"
-    "@wheel"
+  nix.settings = mkMerge [
+    ((import sources.dgnum-infra { }).mkCacheSettings {
+      caches = [ "infra" ];
+    })
+    {
+      trusted-users = [
+        "root"
+        "@wheel"
+      ];
+    }
   ];
   networking.networkmanager = {
     enable = true;
diff --git a/modules/ssh.nix b/modules/ssh.nix
index b6d353b..60e3e59 100644
--- a/modules/ssh.nix
+++ b/modules/ssh.nix
@@ -83,8 +83,8 @@
       };
       "netaccess00.dgn" = {
         user = "root";
-        hostname = "192.168.2.2";
-        # proxyJump = "vault01.dgnum";
+        hostname = "fd26:baf9:d250:8000::200f";
+        proxyJump = "vault01.dgnum";
       };
       "netcore00.dgn" = {
         user = "root";
diff --git a/npins/sources.json b/npins/sources.json
index ac44e3f..a8af6d2 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -39,6 +39,17 @@
       "url": "https://github.com/nix-community/home-manager/archive/65912bc6841cf420eb8c0a20e03df7cbbff5963f.tar.gz",
       "hash": "026hmc30kkyd9ihpjd6cm1b22galdi164ardhmj5x5jcszhjx4r9"
     },
+    "dgnum-infra": {
+      "type": "Git",
+      "repository": {
+        "type": "Git",
+        "url": "https://git.dgnum.eu/DGNum/infrastructure"
+      },
+      "branch": "main",
+      "revision": "accf643294f77744269ad8c812d93956b1faa672",
+      "url": null,
+      "hash": "0iiy2aadlh0jv5hbgq4c14x3ngnc1v4b1wzfhhhwhj14nqmr1ig3"
+    },
     "kat-pkgs": {
       "type": "Git",
       "repository": {
@@ -112,4 +123,4 @@
     }
   },
   "version": 3
-}
\ No newline at end of file
+}