palo/nixos-config
palo/nixos-config
1
0
Fork 0
Code Issues Pull requests Actions Projects Releases Wiki Activity

🔧 add some topology information
All checks were successful
Build all NixOS Configurations / nix build (push) Successful in 19m3s
Details

Browse source
This commit is contained in:
Ingolf Wagner 2024-08-31 08:33:08 +07:00
parent 3833b870dd
commit 8da0bbc3ef
Signed by: palo
GPG key ID: 76BF5F1928B9618B
6 changed files with 31 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
flake.lock
View file

@ -978,11 +978,11 @@
"treefmt-nix": "treefmt-nix_3" "treefmt-nix": "treefmt-nix_3"
}, },
"locked": { "locked": {
"lastModified": 1725014015, "lastModified": 1725067692,
"narHash": "sha256-MFumiomiSQopOPcQgaBsqIRQZ8q2BJiEOm7bGomuu1U=", "narHash": "sha256-8DX7yCJi25D11TphmNYitSQN75Iqq4LFp7QrEPwkhWY=",
"ref": "main", "ref": "main",
"rev": "8a828064a794b75eb2459c6be499bef740c32721", "rev": "e4f6bc36615dd9c32ed2d007b6bc8a4e8fa2275d",
"revCount": 74, "revCount": 75,
"type": "git", "type": "git",
"url": "ssh://forgejo@git.ingolf-wagner.de/palo/nixos-private-parts.git" "url": "ssh://forgejo@git.ingolf-wagner.de/palo/nixos-private-parts.git"
}, },

1
flake.nix
View file

@ -31,6 +31,7 @@
polygon-art.url = "git+https://git.ingolf-wagner.de/palo/polygon-art.git"; polygon-art.url = "git+https://git.ingolf-wagner.de/palo/polygon-art.git";
private-parts.inputs.nixpkgs.follows = "nixpkgs"; # only private input private-parts.inputs.nixpkgs.follows = "nixpkgs"; # only private input
private-parts.url = "git+ssh://forgejo@git.ingolf-wagner.de/palo/nixos-private-parts.git?ref=main"; private-parts.url = "git+ssh://forgejo@git.ingolf-wagner.de/palo/nixos-private-parts.git?ref=main";
#private-parts.url = "git+file:///home/palo/dev/nixos/nixos-private-parts";
retiolum.url = "github:Mic92/retiolum"; retiolum.url = "github:Mic92/retiolum";
srvos.url = "github:nix-community/srvos"; srvos.url = "github:nix-community/srvos";
stylix.inputs.home-manager.follows = "home-manager"; stylix.inputs.home-manager.follows = "home-manager";

7
machines/cherry/topology.nix
View file

@ -3,13 +3,16 @@ with config.lib.topology;
{ {
topology.self = { topology.self = {
interfaces.wifi = {
network = "home";
};
interfaces.wg0 = { interfaces.wg0 = {
network = "wg0"; network = "wg0";
type = "ethernet"; type = "wireguard";
virtual = true; virtual = true;
}; };
interfaces.ztbn67ogn2 = { interfaces.ztbn67ogn2 = {
network = "wg0"; network = "zerotier";
type = "ethernet"; type = "ethernet";
virtual = true; virtual = true;
}; };

13
machines/chungus/topology.nix
View file

@ -3,29 +3,28 @@ with config.lib.topology;
{ {
topology.self = { topology.self = {
interfaces.enp0s31f6 = { interfaces.eth0 = {
network = "home"; network = "home";
type = "ethernet";
}; };
interfaces.wg0 = { interfaces.wg0 = {
addresses = [ "10.100.0.2" ]; addresses = [ "10.100.0.2" ];
network = "wg0"; network = "wg0";
type = "ethernet"; type = "wireguard";
virtual = true; virtual = true;
}; };
interfaces.ztbn67ogn2 = { interfaces.ztbn67ogn2 = {
network = "wg0"; network = "zerotier";
type = "ethernet"; # type = "zerotier";
virtual = true; virtual = true;
}; };
interfaces."tinc.private" = { interfaces."tinc.private" = {
network = "tinc.private"; network = "tinc.private";
type = "ethernet"; # type = "tinc";
virtual = true; virtual = true;
}; };
interfaces."tinc.retiolum" = { interfaces."tinc.retiolum" = {
network = "tinc.retiolum"; network = "tinc.retiolum";
type = "ethernet"; # type = "tinc";
virtual = true; virtual = true;
}; };

15
machines/orbi/topology.nix
View file

@ -3,24 +3,23 @@ with config.lib.topology;
{ {
topology.self = { topology.self = {
# interfaces.enp0s31f6 = { interfaces.eth0 = {
# network = "home"; # internet physicalConnections = [ (mkConnection "internet" "*") ];
# type = "ethernet"; };
# };
interfaces.wg0 = { interfaces.wg0 = {
addresses = [ "10.100.0.1" ]; addresses = [ "10.100.0.1" ];
network = "wg0"; network = "wg0";
type = "ethernet"; type = "wireguard";
virtual = true; virtual = true;
}; };
interfaces.ztbn67ogn2 = { interfaces.ztbn67ogn2 = {
network = "wg0"; network = "zerotier";
type = "ethernet"; # type = "zerotier";
virtual = true; virtual = true;
}; };
interfaces."tinc.private" = { interfaces."tinc.private" = {
network = "tinc.private"; network = "tinc.private";
type = "ethernet"; # type = "tinc";
virtual = true; virtual = true;
}; };

9
nix/topology/networks.nix
View file

@ -2,6 +2,14 @@
with config.lib.topology; with config.lib.topology;
{ {
nodes.internet = mkInternet {
#connections = mkConnection "orbi" "eth0";
};
networks.zerotier = {
name = "clan network";
};
networks.wg0 = { networks.wg0 = {
name = "wg0"; name = "wg0";
cidrv4 = "10.100.0.0/24"; cidrv4 = "10.100.0.0/24";
@ -14,7 +22,6 @@ with config.lib.topology;
networks."tinc.retiolum" = { networks."tinc.retiolum" = {
name = "tinc retiolum"; name = "tinc retiolum";
#cidrv4 = "192.168.0.0/24";
}; };
} }