diff --git a/flake.lock b/flake.lock index cfb31bf..7e509a7 100644 --- a/flake.lock +++ b/flake.lock @@ -694,11 +694,11 @@ "sops-nix": "sops-nix" }, "locked": { - "lastModified": 1773114599, - "narHash": "sha256-xPPkXW9mlszorwDVJ3bXQsKVg0wIpiiOCL9kbZlyTjY=", + "lastModified": 1773144129, + "narHash": "sha256-F00t0DRlt0GsaUxgp1qreSpV6qaZy0oNX9j98qj+NoY=", "owner": "genebean", "repo": "private-flake", - "rev": "8d886b681a65ad3e2a102d40a7a34001b6973450", + "rev": "ed799ef806b4dc232866f9411ac5bc32b6f9ff5f", "type": "github" }, "original": { diff --git a/modules/hosts/nixos/hetznix01/default.nix b/modules/hosts/nixos/hetznix01/default.nix index b39565d..98122b2 100644 --- a/modules/hosts/nixos/hetznix01/default.nix +++ b/modules/hosts/nixos/hetznix01/default.nix @@ -1,9 +1,10 @@ { config, pkgs, username, ... }: { imports = [ - ./hardware-configuration.nix - ./disk-config.nix - ./post-install ../../common/linux/nixroutes.nix + ./disk-config.nix + ./hardware-configuration.nix + ./post-install + inputs.private-flake.nixosModules.private.hetznix01 ]; system.stateVersion = "24.05"; @@ -85,18 +86,6 @@ }; }; - systemd.network = { - enable = true; - networks."10-wan" = { - matchConfig.Name = "enp1s0"; - address = config.private-flake.hetznix01.networkAddresses; - dns = config.private-flake.hetznix01.dnsServers; - routes = config.private-flake.hetznix01.networkRoutes; - # make the routes on this interface a dependency for network-online.target - linkConfig.RequiredForOnline = "routable"; - }; - }; - users.users.${username} = { isNormalUser = true; description = "Gene Liverman"; diff --git a/modules/hosts/nixos/hetznix02/default.nix b/modules/hosts/nixos/hetznix02/default.nix index b62a34f..bbfcf74 100644 --- a/modules/hosts/nixos/hetznix02/default.nix +++ b/modules/hosts/nixos/hetznix02/default.nix @@ -1,9 +1,10 @@ { pkgs, username, ... }: { imports = [ - ./hardware-configuration.nix - ./disk-config.nix - ./post-install ../../common/linux/nixroutes.nix + ./disk-config.nix + ./hardware-configuration.nix + ./post-install + inputs.private-flake.nixosModules.private.hetznix02 ]; system.stateVersion = "24.05"; @@ -52,31 +53,6 @@ ''; }; - systemd.network = { - enable = true; - networks."10-wan" = { - matchConfig.Name = "enp1s0"; - address = [ - "195.201.224.89/32" - "2a01:4f8:1c1e:aa68::1/64" - "fe80::9400:3ff:feae:45aa/64" - ]; - dns = [ - "185.12.64.1" - "185.12.64.2" - "2a01:4ff:ff00::add:1" - "2a01:4ff:ff00::add:2" - ]; - routes = [ - { Destination = "172.31.1.1"; } - { Gateway = "172.31.1.1"; GatewayOnLink = true; } - { Gateway = "fe80::1"; } - ]; - # make the routes on this interface a dependency for network-online.target - linkConfig.RequiredForOnline = "routable"; - }; - }; - users.users.${username} = { isNormalUser = true; description = "Gene Liverman";