DGNum/lab-infra
8
1
Fork 1
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: DGNum:c0afb0657c8ba6d8e20750f6a661d8e4b4975a87
Branches Tags
DGNum:main
DGNum:beta_dns_config
DGNum:staging
...
compare: DGNum:a41a98f85269b3969b1764c56fbb747a3dfcd3e7
Branches Tags
DGNum:beta_dns_config
DGNum:main
DGNum:staging

3 commits
c0afb0657c ... a41a98f852

Author SHA1 Message Date
sinavir
a41a98f852
chore(npins): Update
All checks were successful
lint / check (push) Successful in 24s
Details
2024-11-19 13:00:35 +01:00
sinavir
3e6719c684
chore(router02/networking): Update routes syntax 2024-11-19 13:00:35 +01:00
sinavir
5bc548944a
fix(krz01): remove unused code 2024-11-11 01:20:57 +01:00
5 changed files with 53 additions and 112 deletions
Show stats Expand all files Collapse all files

3
machines/krz01/_configuration.nix
View file

@ -7,9 +7,6 @@ lib.extra.mkConfig {
enabledServices = [ enabledServices = [
# INFO: This list needs to stay sorted alphabetically # INFO: This list needs to stay sorted alphabetically
# Machine learning API machine
# "microvm-ml01"
# "microvm-router01"
"nvidia-tesla-k80" "nvidia-tesla-k80"
"ollama" "ollama"
"whisper" "whisper"

22
machines/krz01/microvm-ml01.nix
View file

@ -1,22 +0,0 @@
_: {
microvm.autostart = [ "ml01" ];
microvm.vms.ml01 = {
config = {
networking.hostName = "ml01";
microvm = {
hypervisor = "cloud-hypervisor";
vcpu = 4;
mem = 4096;
balloonMem = 2048;
shares = [
{
source = "/nix/store";
mountPoint = "/nix/.ro-store";
tag = "ro-store";
proto = "virtiofs";
}
];
};
};
};
}

16
machines/krz01/microvm-router01.nix
View file

@ -1,16 +0,0 @@
_: {
microvm.autostart = [ "router01" ];
microvm.vms.router01 = {
config = {
networking.hostName = "router01";
microvm.shares = [
{
source = "/nix/store";
mountPoint = "/nix/.ro-store";
tag = "ro-store";
proto = "virtiofs";
}
];
};
};
}

18
machines/router02/networking.nix
View file

@ -40,18 +40,14 @@
}; };
routes = [ routes = [
{ {
routeConfig = {
Destination = "::/0"; Destination = "::/0";
Table = "he"; Table = "he";
Scope = "global"; Scope = "global";
};
} }
{ {
# Use HE tunnel for router trafic as well # Use HE tunnel for router trafic as well
routeConfig = {
Destination = "::/0"; Destination = "::/0";
Scope = "global"; Scope = "global";
};
} }
]; ];
routingPolicyRules = [ routingPolicyRules = [
@ -82,41 +78,31 @@
}; };
routes = [ routes = [
{ {
routeConfig = {
Gateway = "2a0b:cbc0:1::215"; Gateway = "2a0b:cbc0:1::215";
PreferredSource = "2a0e:e701:1120::1"; PreferredSource = "2a0e:e701:1120::1";
};
} }
{ {
# Local route # Local route
routeConfig = {
Table = "mwan"; Table = "mwan";
Destination = "2a0e:e701:1120::/64"; Destination = "2a0e:e701:1120::/64";
};
} }
{ {
# Default unreachable route for unattributed prefixes of our /48 # Default unreachable route for unattributed prefixes of our /48
routeConfig = {
Table = "mwan"; Table = "mwan";
Metric = 9999; Metric = 9999;
Destination = "2a0e:e701:1120::/48"; Destination = "2a0e:e701:1120::/48";
Type = "unreachable"; Type = "unreachable";
};
} }
{ {
routeConfig = {
Table = "mwan"; Table = "mwan";
Gateway = "2a0b:cbc0:1::215"; Gateway = "2a0b:cbc0:1::215";
PreferredSource = "2a0e:e701:1120::1"; PreferredSource = "2a0e:e701:1120::1";
};
} }
# IPv4 # IPv4
{ {
routeConfig = {
Scope = "global"; Scope = "global";
Table = "mwan"; Table = "mwan";
Gateway = "10.1.1.49"; Gateway = "10.1.1.49";
};
} }
]; ];
routingPolicyRules = [ routingPolicyRules = [
@ -165,10 +151,8 @@
]; ];
routes = [ routes = [
{ {
routeConfig = {
Table = "mwan"; Table = "mwan";
Destination = "2a0e:e701:1120:1000::/64"; Destination = "2a0e:e701:1120:1000::/64";
};
} }
]; ];
}; };
@ -188,11 +172,9 @@
]; ];
routes = [ routes = [
{ {
routeConfig = {
Table = "he"; Table = "he";
Scope = "global"; Scope = "global";
Destination = "2001:470:1f13:187::/64"; Destination = "2001:470:1f13:187::/64";
};
} }
]; ];
}; };

58
npins/sources.json
View file

@ -25,10 +25,10 @@
"pre_releases": false, "pre_releases": false,
"version_upper_bound": null, "version_upper_bound": null,
"release_prefix": null, "release_prefix": null,
"version": "v1.8.0", "version": "v1.9.0",
"revision": "624fd86460e482017ed9c3c3c55a3758c06a4e7f", "revision": "49a4936cee640e27d74baee6fd1278285d29b100",
"url": "https://api.github.com/repos/nix-community/disko/tarball/v1.8.0", "url": "https://api.github.com/repos/nix-community/disko/tarball/v1.9.0",
"hash": "06ifryv6rw25cz8zda4isczajdgrvcl3aqr145p8njxx5jya2d77" "hash": "0j76ar4qz320fakdii4659w5lww8wiz6yb7g47npywqvf2lbp388"
}, },
"git-hooks": { "git-hooks": {
"type": "Git", "type": "Git",
@ -38,9 +38,9 @@
"repo": "git-hooks.nix" "repo": "git-hooks.nix"
}, },
"branch": "master", "branch": "master",
"revision": "1211305a5b237771e13fcca0c51e60ad47326a9a", "revision": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
"url": "https://github.com/cachix/git-hooks.nix/archive/1211305a5b237771e13fcca0c51e60ad47326a9a.tar.gz", "url": "https://github.com/cachix/git-hooks.nix/archive/cd1af27aa85026ac759d5d3fccf650abe7e1bbf0.tar.gz",
"hash": "1qz8d9g7rhwjk4p2x0rx59alsf0dpjrb6kpzs681gi3rjr685ivq" "hash": "1icl4cz33lkr4bz7fvlf3jppmahgpzij81wfa5any3z7w7b5lnxw"
}, },
"infrastructure": { "infrastructure": {
"type": "Git", "type": "Git",
@ -49,9 +49,9 @@
"url": "https://git.dgnum.eu/DGNum/infrastructure" "url": "https://git.dgnum.eu/DGNum/infrastructure"
}, },
"branch": "main", "branch": "main",
"revision": "45f2f5905506ad7523bde63ae94d0a3dc19dd604", "revision": "32f68a54a92b3742030d43cb0402ea9de332a004",
"url": null, "url": null,
"hash": "171rwwvx4mq01g1c2rhn6v4hyv5c8g2jzzxmff4qz70yzlhs8806" "hash": "1wk0wwa74gq35rx77jannkz2y1zlqz2v7ngm0sn6zj9mx9wwp0b2"
}, },
"lix": { "lix": {
"type": "Git", "type": "Git",
@ -60,9 +60,9 @@
"url": "https://git.lix.systems/lix-project/lix.git" "url": "https://git.lix.systems/lix-project/lix.git"
}, },
"branch": "main", "branch": "main",
"revision": "ed9b7f4f84fd60ad8618645cc1bae2d686ff0db6", "revision": "f116608a20430b8484814300cdf22eebeb75a59f",
"url": null, "url": null,
"hash": "05kxga8fs9h4qm0yvp5l7jvsda7hzqs7rvxcn8r52dqg3c80hva9" "hash": "0hhjx3vk7rchkb4njhsf4vk2f7ipkpqb9jvywm0xcbpwa08xffis"
}, },
"lix-module": { "lix-module": {
"type": "Git", "type": "Git",
@ -71,9 +71,9 @@
"url": "https://git.lix.systems/lix-project/nixos-module.git" "url": "https://git.lix.systems/lix-project/nixos-module.git"
}, },
"branch": "main", "branch": "main",
"revision": "fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d", "revision": "aa2846680fa9a2032939d720487942567fd9eb63",
"url": null, "url": null,
"hash": "0jxpqaz12lqibg03iv36sa0shfvamn2yhg937llv3kl4csijd34f" "hash": "0gb174800sgh6y6sir23nxsx85xrk478hbwqbzyd46ac34clz9wz"
}, },
"lon": { "lon": {
"type": "Git", "type": "Git",
@ -106,9 +106,9 @@
"url": "https://git.hubrecht.ovh/hubrecht/nix-modules.git" "url": "https://git.hubrecht.ovh/hubrecht/nix-modules.git"
}, },
"branch": "main", "branch": "main",
"revision": "2fd7c7810b2a901020ddd2d0cc82810b83a313fc", "revision": "75e8d70a051dd19d126b5248b62f61d6f8ce4361",
"url": null, "url": null,
"hash": "0rag870ll745r5isnk6hlxv0b0sbgriba5k6nihahcwsal2f4830" "hash": "0yx5by3v2cshiidyh27n75lcqy9d1kk5zz5mchmfv63s9p0cjzqn"
}, },
"nix-patches": { "nix-patches": {
"type": "GitRelease", "type": "GitRelease",
@ -131,9 +131,9 @@
"url": "https://git.hubrecht.ovh/hubrecht/nix-pkgs" "url": "https://git.hubrecht.ovh/hubrecht/nix-pkgs"
}, },
"branch": "main", "branch": "main",
"revision": "0e80d4dcdd54a75556c0784de55dc139ad4fe797", "revision": "3ab3e49269d9e2536c8c5f78d4da673d7a3f5286",
"url": null, "url": null,
"hash": "1hlb0cczxq0jrzw4lhmkibnb8skcar0rmny594aqgyikknwzx2qf" "hash": "0b4k0gchxcdlmvs88403hdbidsxswigzxswcba7a3fxz9d884c4y"
}, },
"nixos-23.11": { "nixos-23.11": {
"type": "Channel", "type": "Channel",
@ -144,8 +144,8 @@
"nixos-24.05": { "nixos-24.05": {
"type": "Channel", "type": "Channel",
"name": "nixos-24.05", "name": "nixos-24.05",
"url": "https://releases.nixos.org/nixos/24.05/nixos-24.05.5518.ecbc1ca8ffd6/nixexprs.tar.xz", "url": "https://releases.nixos.org/nixos/24.05/nixos-24.05.6668.e8c38b73aeb2/nixexprs.tar.xz",
"hash": "1yr2v17d8jg9567rvadv62bpr6i47fp73by2454yjxh1m9ric2cm" "hash": "0lhh36z3fvd3b64dz7an08y3c3shb67aj17ny9z28bs21i3dc5yh"
}, },
"nixos-generators": { "nixos-generators": {
"type": "Git", "type": "Git",
@ -155,21 +155,21 @@
"repo": "nixos-generators" "repo": "nixos-generators"
}, },
"branch": "master", "branch": "master",
"revision": "9ae128172f823956e54947fe471bc6dfa670ecb4", "revision": "15a87ccb45e06d24a9fd5f99a49782efe11b23f0",
"url": "https://github.com/nix-community/nixos-generators/archive/9ae128172f823956e54947fe471bc6dfa670ecb4.tar.gz", "url": "https://github.com/nix-community/nixos-generators/archive/15a87ccb45e06d24a9fd5f99a49782efe11b23f0.tar.gz",
"hash": "1zn3lykymimzh21q4fixw6ql42n8j82dqwm5axifhcnl8dsdgrvr" "hash": "0mwllbwinr6cira94347vhzq3jn3zgp28xg6w1ga0ncls7s476q4"
}, },
"nixos-unstable": { "nixos-unstable": {
"type": "Channel", "type": "Channel",
"name": "nixos-unstable", "name": "nixos-unstable",
"url": "https://releases.nixos.org/nixos/unstable/nixos-24.11pre688563.bc947f541ae5/nixexprs.tar.xz", "url": "https://releases.nixos.org/nixos/unstable/nixos-25.05beta708622.5e4fbfb6b3de/nixexprs.tar.xz",
"hash": "1jsaxwi128fiach3dj8rdj5agqivsr4sidb8lmdnl7g07fl9x0kj" "hash": "18zd6qnn1zmz3pgq2q484lmdk486ncxyp8r5g9c71r9dc8jr5dnc"
}, },
"nixpkgs": { "nixpkgs": {
"type": "Channel", "type": "Channel",
"name": "nixpkgs-unstable", "name": "nixpkgs-unstable",
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-24.11pre689466.7d49afd36b55/nixexprs.tar.xz", "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.05pre709559.5083ec887760/nixexprs.tar.xz",
"hash": "0r4zb6j8in4dk7gxciapfm49dqbdd0c7ajjzj9iy2xrrj5aj32qp" "hash": "1z912j1lmrg8zp2hpmmi69dls9zlpvqfvdkvh5xc3x6iqkqwn0cd"
}, },
"proxmox-nixos": { "proxmox-nixos": {
"type": "Git", "type": "Git",
@ -179,9 +179,9 @@
"repo": "proxmox-nixos" "repo": "proxmox-nixos"
}, },
"branch": "main", "branch": "main",
"revision": "950e4cccac0f942076e8558f7f9f4d496cabfb18", "revision": "803e86e10e02f92769e08e4802b7b1cb1423d1d6",
"url": "https://github.com/SaumonNet/proxmox-nixos/archive/950e4cccac0f942076e8558f7f9f4d496cabfb18.tar.gz", "url": "https://github.com/SaumonNet/proxmox-nixos/archive/803e86e10e02f92769e08e4802b7b1cb1423d1d6.tar.gz",
"hash": "0bhqw42ydc0jfkfqw64xsg518a1pbxnvpqw92nna7lm8mzpxm6d4" "hash": "1jfbx248892qqm0wsknjjckfgha9d8f0ydmgk28z33cqahq8wsg7"
} }
}, },
"version": 3 "version": 3