diff --git a/flake.nix b/flake.nix index e5ffdab..799a497 100644 --- a/flake.nix +++ b/flake.nix @@ -112,6 +112,7 @@ }; modules = [ disko.nixosModules.disko + microvm.nixosModules.host home-manager.nixosModules.home-manager { home-manager = { diff --git a/modules/hosts/nixos/microvms/nginx-proxy/default.nix b/modules/hosts/nixos/microvms/nginx-proxy/default.nix index 3b38306..afb04a8 100644 --- a/modules/hosts/nixos/microvms/nginx-proxy/default.nix +++ b/modules/hosts/nixos/microvms/nginx-proxy/default.nix @@ -22,6 +22,11 @@ mountPoint = "/nix/.ro-store"; } ]; + interfaces = [{ + type = "tap"; + id = "vm-nginx-proxy"; + mac = "02:00:00:00:00:01"; + }]; }; } diff --git a/modules/hosts/nixos/nixnuc/default.nix b/modules/hosts/nixos/nixnuc/default.nix index db7324a..8efa2d9 100644 --- a/modules/hosts/nixos/nixnuc/default.nix +++ b/modules/hosts/nixos/nixnuc/default.nix @@ -1,8 +1,9 @@ { inputs, config, hostname, microvm, pkgs, sops-nix, username, ... }: { imports = [ - microvm.nixosModules.host ./hardware-configuration.nix ./audiobookshelf.nix + #microvm.nixosModules.host + #../microvms/nginx-proxy ]; system.stateVersion = "23.11"; @@ -41,9 +42,9 @@ ]; }; - microvm.autostart = [ + #microvm.autostart = [ #"nginx-proxy" - ]; + #]; networking = { # Open ports in the firewall. @@ -55,24 +56,25 @@ hostId = "c5826b45"; # head -c4 /dev/urandom | od -A none -t x4 networkmanager.enable = true; - enableIPv6 = true; - useDHCP = true; vlans = { - vlan23 = { id = 23; interface = "eno1-23"; }; + vlan23 = { id = 23; interface = "eno1"; }; }; bridges = { br1-23 = { interfaces = [ "vlan23" ]; }; }; + useDHCP = false; interfaces = { eno1.ipv4.addresses = [{ address = "192.168.20.190"; prefixLength = 24; }]; - br1-23.ipv4.addresses = [{ - address = "192.168.23.21"; - prefixLength = 24; - }]; + #br1-23.ipv4.addresses = [{ + #address = "192.168.23.21"; + #prefixLength = 24; + #}]; }; + defaultGateway = "192.168.20.1"; + nameservers = [ "192.168.20.1" ]; }; # Hardware Transcoding for Jellyfin @@ -106,6 +108,7 @@ enable = true; openFirewall = true; }; + lldpd.enable = true; nginx = { enable = true; virtualHosts."jellyfin" = {