rpqt/flocon
rpqt/flocon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove nix-topology

Browse source
This commit is contained in:
Romain Paquet 2025-09-15 21:37:21 +02:00
parent c44f08d6be
commit f2a76156c9
9 changed files with 2 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

10
flake.nix
View file

@ -16,7 +16,6 @@
flake-parts.lib.mkFlake { inherit inputs; } ({
imports = [
inputs.clan-core.flakeModules.default
inputs.nix-topology.flakeModule
./clanServices/flake-module.nix
./devShells/flake-module.nix
@ -29,12 +28,6 @@
"aarch64-linux"
];
perSystem = _: {
topology.modules = [
./topology.nix
];
};
flake = {
packages.aarch64-linux.genepi-installer-sd-image = nixos-generators.nixosGenerate {
specialArgs = {
@ -83,9 +76,6 @@
ignis.url = "github:ignis-sh/ignis";
ignis.inputs.nixpkgs.follows = "nixpkgs";
nix-topology.url = "github:oddlama/nix-topology";
nix-topology.inputs.nixpkgs.follows = "nixpkgs";
matugen.url = "github:InioX/Matugen";
matugen.inputs.nixpkgs.follows = "nixpkgs";

4
machines/crocus/configuration.nix
View file

@ -5,10 +5,10 @@
{
imports = [
# ./radicle.nix
../../system
../../system/core
../../system/nix
../../modules/remote-builder.nix
./nextcloud.nix
./topology.nix
../../modules/unbound.nix
../../modules/unbound-auth.nix
self.nixosModules.gitea

11
machines/crocus/topology.nix
View file

@ -1,11 +0,0 @@
{
topology.self = {
hardware.info = "x86_64 VPS";
interfaces = {
tailscale0 = {
type = "wireguard";
network = "tailscale";
};
};
};
}

1
machines/genepi/configuration.nix
View file

@ -18,7 +18,6 @@
./pinchflat.nix
./syncthing.nix
./taskchampion.nix
./topology.nix
../../modules/acme-home.nix
../../modules/lounge.nix

24
machines/genepi/topology.nix
View file

@ -1,24 +0,0 @@
{ config, ... }:
let
inherit (config.lib.topology)
mkConnection
;
in
{
topology.self = {
hardware.info = "Raspberry Pi 4B";
interfaces = {
tailscale0 = {
type = "wireguard";
network = "tailscale";
};
enp1s0 = {
type = "ethernet";
network = "home";
physicalConnections = [
(mkConnection "cassoulet" "eth1")
];
};
};
};
}

1
machines/haze/configuration.nix
View file

@ -17,7 +17,6 @@
./thunderbird.nix
./network.nix
./syncthing.nix
./topology.nix
./video.nix
../../system

12
machines/haze/topology.nix
View file

@ -1,12 +0,0 @@
{
topology.self = {
hardware.info = "VivoBook Laptop";
interfaces = {
tailscale0 = {
type = "wireguard";
network = "tailscale";
virtual = true;
};
};
};
}

1
system/network/default.nix
View file

@ -1,7 +1,6 @@
{ self, ... }:
{
imports = [
self.inputs.nix-topology.nixosModules.default
./tailscale.nix
];
}

40
topology.nix
View file

@ -1,40 +0,0 @@
{ config, ... }:
let
inherit (config.lib.topology)
mkConnection
mkInternet
mkRouter
;
in
{
nodes.internet = mkInternet {
connections = [
(mkConnection "cassoulet" "wan1")
(mkConnection "crocus" "enp1s0")
];
};
nodes.cassoulet = mkRouter "Cassoulet" {
info = "BBox Fibre";
interfaceGroups = [
[ "wan1" ]
[
"eth1"
"eth2"
"eth3"
"eth4"
]
];
};
networks.home = {
name = "Home Network";
cidrv4 = "192.168.1.1/24";
};
networks.tailscale = {
name = "Tailscale";
cidrv4 = "100.100.181.10/32";
cidrv6 = "fd7a:115c:a1e0::2401:b50a/128";
};
}