sokai/mynixos-config
1
1
Fork 0
forked from mirrors_public/oddlama_nix-config
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: put real MAC addresses in repo secrets

Browse source
This commit is contained in:
oddlama 2023-03-15 17:43:04 +01:00
parent 6f8f74cc69
commit f2f8ca71bb
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
13 changed files with 47 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

24
flake.lock generated
View file

@ -28,11 +28,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1678494029, "lastModified": 1678898163,
"narHash": "sha256-2DV9aeUsFuczk4olt4WtlRVuQwIjF8OFK4EzfJ5JFJA=", "narHash": "sha256-Cn35A08nzi+S9+RfFyAD4yMBGFerlk9ESMhAm/CJqRE=",
"owner": "oddlama", "owner": "oddlama",
"repo": "agenix-rekey", "repo": "agenix-rekey",
"rev": "7eaf151db39f62c9fbde5c19778e3cce3be243ad", "rev": "653dcdbeba427b0c88137683055b8033c987b137",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -166,11 +166,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1678464939, "lastModified": 1678886248,
"narHash": "sha256-pRMlwOUkO1OwSi7qF6XR/zcocWy/ZYxXgbYWvnZQO9k=", "narHash": "sha256-ff81NJtc+AgQhUlTCkx8t8hda0o72vSxDeHVGrfxH70=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "7224d7c54c5fc74cdf60b208af6148ed3295aa32", "rev": "2bd74d92bc7345f323ebcbfeb631d5cf4067ed8e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -211,11 +211,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1678380223, "lastModified": 1678819893,
"narHash": "sha256-HUxnK38iqrX84QdQxbFcosRKV3/koj1Zzp5b5aP4lIo=", "narHash": "sha256-lfA6WGdxPsPkBK5Y19ltr5Sn7v7MlT+jpZ4nUgco0Xs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1e2590679d0ed2cee2736e8b80373178d085d263", "rev": "7067edc68c035e21780259ed2d26e1f164addaa2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -299,11 +299,11 @@
}, },
"templates": { "templates": {
"locked": { "locked": {
"lastModified": 1676551231, "lastModified": 1678524284,
"narHash": "sha256-JS1o31ew90UiccpoQHxP84Wn0n7ClgyVpAsJV20Ep5E=", "narHash": "sha256-3tk4RHKrIbz2tNVyW2WOrgZBe26jhfBiz7bzb7b8p5I=",
"owner": "NixOS", "owner": "NixOS",
"repo": "templates", "repo": "templates",
"rev": "3ac7e8ba52feb2b89e943a6ce0f7a30d6faf81c6", "rev": "0edaa0637331e9d8acca5c8ec67936a2c8b8749b",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
hosts/nom/net.nix
View file

@ -1,4 +1,4 @@
{ { nodeSecrets, ... }: {
networking = { networking = {
hostId = "4313abca"; hostId = "4313abca";
wireless.iwd.enable = true; wireless.iwd.enable = true;
@ -7,14 +7,14 @@
systemd.network.networks = { systemd.network.networks = {
"10-lan1" = { "10-lan1" = {
DHCP = "yes"; DHCP = "yes";
matchConfig.MACAddress = "00:00:00:00:00:00"; matchConfig.MACAddress = nodeSecrets.networking.interfaces.lan1.mac;
networkConfig.IPv6PrivacyExtensions = "kernel"; networkConfig.IPv6PrivacyExtensions = "kernel";
dhcpV4Config.RouteMetric = 10; dhcpV4Config.RouteMetric = 10;
dhcpV6Config.RouteMetric = 10; dhcpV6Config.RouteMetric = 10;
}; };
"10-wlan1" = { "10-wlan1" = {
DHCP = "yes"; DHCP = "yes";
matchConfig.MACAddress = "00:00:00:00:00:00"; matchConfig.MACAddress = nodeSecrets.networking.interfaces.wlan1.mac;
networkConfig.IPv6PrivacyExtensions = "kernel"; networkConfig.IPv6PrivacyExtensions = "kernel";
dhcpV4Config.RouteMetric = 40; dhcpV4Config.RouteMetric = 40;
dhcpV6Config.RouteMetric = 40; dhcpV6Config.RouteMetric = 40;

0
hosts/nom/initrd_host_ed25519_key.age → hosts/nom/secrets/initrd_host_ed25519_key.age
View file

BIN
hosts/nom/secrets/secrets.nix.age Normal file
View file

Binary file not shown.

10
hosts/ward/net.nix
View file

@ -1,19 +1,17 @@
{ { nodeSecrets, ... }: {
networking = { networking.hostId = "49ce3b71";
hostId = "49ce3b71";
};
systemd.network.networks = { systemd.network.networks = {
"10-lan1" = { "10-lan1" = {
DHCP = "yes"; DHCP = "yes";
matchConfig.MACAddress = "00:00:00:00:00:00"; matchConfig.MACAddress = nodeSecrets.networking.interfaces.lan1.mac;
networkConfig.IPv6PrivacyExtensions = "kernel"; networkConfig.IPv6PrivacyExtensions = "kernel";
dhcpV4Config.RouteMetric = 10; dhcpV4Config.RouteMetric = 10;
dhcpV6Config.RouteMetric = 10; dhcpV6Config.RouteMetric = 10;
}; };
"10-lan2" = { "10-lan2" = {
DHCP = "yes"; DHCP = "yes";
matchConfig.MACAddress = "00:00:00:00:00:00"; matchConfig.MACAddress = nodeSecrets.networking.interfaces.lan2.mac;
networkConfig.IPv6PrivacyExtensions = "kernel"; networkConfig.IPv6PrivacyExtensions = "kernel";
dhcpV4Config.RouteMetric = 20; dhcpV4Config.RouteMetric = 20;
dhcpV6Config.RouteMetric = 20; dhcpV6Config.RouteMetric = 20;

0
hosts/ward/initrd_host_ed25519_key.age → hosts/ward/secrets/initrd_host_ed25519_key.age
View file

10
hosts/ward/secrets/secrets.nix.age Normal file
View file

@ -0,0 +1,10 @@
age-encryption.org/v1
-> X25519 fJutn5YCebczN3xQLTDNPKQlNj4p47h1sUgkyVfRARw
V61YLy8oXTJZUFhpxYCM7glt1u3LKtVgkp0XDdYwlaE
-> piv-p256 xqSe8Q AzOVI4DKP7g7Rzr7NbH6olY/T57R9BbO5gNpeXrCn+xZ
cmD4KdE3CIbKp36azm7fuL5V1EVvgcuaLE8/cEzE7x0
-> @Zm-grease )8>fIDi YH{ Qp_) VJs.7
jkMFKrAANRssnB6n0Cr6cxVc5g
--- eNSoD5B33WIgF5M26POfs5rUjqVNb6BqiMedIMS7/H8
&ûë^ÑÓ”3 ˜œÞÌsˆ $mÃ"‚e­ºk­·Ù¦~BŠõ”ad°šeì^é9’š/Š�aI/½�šyJí‚F'œIÐ^Ã�WåPÁÎ/0uŽ;ãææ—ä‘bn
TXró·/,è¹Û‘æ%ÀSɃ­}娵`ɃϞº {–¤æµ$˜š�Ûý”O

1
hosts/zackbiene/default.nix
View file

@ -21,6 +21,7 @@
./zigbee2mqtt.nix ./zigbee2mqtt.nix
./esphome.nix ./esphome.nix
./nginx.nix ./nginx.nix
./hostapd.nix
]; ];
boot.loader.grub.enable = false; boot.loader.grub.enable = false;

6
hosts/zackbiene/hostapd.nix Normal file
View file

@ -0,0 +1,6 @@
{
lib,
config,
...
}: {
}

15
hosts/zackbiene/net.nix
View file

@ -1,15 +1,20 @@
{ { nodeSecrets, ... }: {
networking = { networking.hostId = "f7e6acdc";
hostId = "f7e6acdc";
};
systemd.network.networks = { systemd.network.networks = {
"10-lan1" = { "10-lan1" = {
DHCP = "yes"; DHCP = "yes";
matchConfig.MACAddress = "00:00:00:00:00:00"; matchConfig.MACAddress = nodeSecrets.networking.interfaces.lan1.mac;
networkConfig.IPv6PrivacyExtensions = "kernel"; networkConfig.IPv6PrivacyExtensions = "kernel";
dhcpV4Config.RouteMetric = 10; dhcpV4Config.RouteMetric = 10;
dhcpV6Config.RouteMetric = 10; dhcpV6Config.RouteMetric = 10;
}; };
#"10-wlan1" = {
# DHCP = "yes";
# matchConfig.MACAddress = nodeSecrets.networking.interfaces.wlan1.mac;
# networkConfig.IPv6PrivacyExtensions = "kernel";
# dhcpV4Config.RouteMetric = 40;
# dhcpV6Config.RouteMetric = 40;
#};
}; };
} }

BIN
hosts/zackbiene/secrets/secrets.nix.age
View file

Binary file not shown.

2
modules/initrd-ssh.nix
View file

@ -3,7 +3,7 @@
name, name,
... ...
}: { }: {
rekey.secrets.initrd_host_ed25519_key.file = ../hosts/${name}/initrd_host_ed25519_key.age; rekey.secrets.initrd_host_ed25519_key.file = ../hosts/${name}/secrets/initrd_host_ed25519_key.age;
boot.initrd.network.enable = true; boot.initrd.network.enable = true;
boot.initrd.network.ssh = { boot.initrd.network.ssh = {

BIN
secrets/secrets.nix.age
View file

Binary file not shown.