diff options
| -rw-r--r-- | modules/snorlax/default.nix | 2 | ||||
| -rw-r--r-- | modules/snorlax/networking.nix | 47 | ||||
| -rw-r--r-- | modules/snorlax/uvm-guests/cpanel.nix | 17 |
3 files changed, 40 insertions, 26 deletions
diff --git a/modules/snorlax/default.nix b/modules/snorlax/default.nix index dac4a4a..359ee8d 100644 --- a/modules/snorlax/default.nix +++ b/modules/snorlax/default.nix @@ -5,7 +5,7 @@ ./git.nix ./samba.nix ./nginx.nix - ./uvm-guests + # ./uvm-guests ./networking.nix ../core diff --git a/modules/snorlax/networking.nix b/modules/snorlax/networking.nix index f973b8e..daca7af 100644 --- a/modules/snorlax/networking.nix +++ b/modules/snorlax/networking.nix @@ -2,31 +2,30 @@ { networking.hostName = "snorlax"; networking.hostId = "1d1ebf34"; - networking.useNetworkd = true; + # networking.useNetworkd = true; - systemd.network.enable = true; + # systemd.network.enable = true; + # systemd.network.networks."10-lan" = { + # matchConfig.Name = ["eno1" "vm-*"]; + # networkConfig = { + # Bridge = "br0"; + # }; + # }; - systemd.network.networks."10-lan" = { - matchConfig.Name = ["eno1" "vm-*"]; - networkConfig = { - Bridge = "br0"; - }; - }; + # systemd.network.netdevs."br0" = { + # netdevConfig = { + # Name = "br0"; + # Kind = "bridge"; + # }; + # }; - systemd.network.netdevs."br0" = { - netdevConfig = { - Name = "br0"; - Kind = "bridge"; - }; - }; - - systemd.network.networks."10-lan-bridge" = { - matchConfig.Name = "br0"; - networkConfig = { - Address = ["192.168.50.7/24" ]; - Gateway = "192.168.50.1"; - DNS = ["192.168.50.1"]; - }; - linkConfig.RequiredForOnline = "routable"; - }; + # systemd.network.networks."10-lan-bridge" = { + # matchConfig.Name = "br0"; + # networkConfig = { + # Address = ["192.168.50.7/24" ]; + # Gateway = "192.168.50.1"; + # DNS = ["192.168.50.1"]; + # }; + # linkConfig.RequiredForOnline = "routable"; + # }; } diff --git a/modules/snorlax/uvm-guests/cpanel.nix b/modules/snorlax/uvm-guests/cpanel.nix index f59a306..b7fb4c3 100644 --- a/modules/snorlax/uvm-guests/cpanel.nix +++ b/modules/snorlax/uvm-guests/cpanel.nix @@ -15,12 +15,27 @@ config = { networking.hostName = "cpanel"; + systemd.network.enable = true; + systemd.network.networks."20-lan" = { + matchConfig.Type = "ether"; + networkConfig = { + # Address = ["192.168.50.3/24" "2001:db8::b/64"]; + Gateway = "192.168.50.1"; + DNS = ["192.168.50.1"]; + IPv6AcceptRA = true; + DHCP = "yes"; + }; + }; + + home-manager.users.jras.home.stateVersion = "24.11"; imports = [ inputs.home-manager.nixosModules.home-manager inputs.disko.nixosModules.disko inputs.nixos-facter-modules.nixosModules.facter - ../../core + ../../core/users.nix + ../../core/packages.nix + ../../core/services.nix ]; |