diff --git a/machines/photo01/_configuration.nix b/machines/photo01/_configuration.nix index 821a18c..0f385bd 100644 --- a/machines/photo01/_configuration.nix +++ b/machines/photo01/_configuration.nix @@ -1,9 +1,5 @@ # TODO: revamp to use the same framework as the other VMs -{ - pkgs, - inputs, - ... -}: +{ pkgs, inputs, ... }: let address = "129.199.146.101"; @@ -20,7 +16,20 @@ in # Bootloader. boot.loader.systemd-boot.enable = true; - networking.hostName = "photoprism"; + networking = { + hostName = "photoprism"; + + firewall.allowedTCPPorts = [ + 22 + 80 + 443 + 8007 + ]; + firewall.allowedUDPPorts = [ ]; + + useNetworkd = true; + }; + disko.devices = import ./disko.nix; @@ -46,15 +55,6 @@ in security.acme.acceptTerms = true; security.acme.defaults.email = "webmaster@nixos.org"; - networking.firewall.allowedTCPPorts = [ - 22 - 80 - 443 - 8007 - ]; - networking.firewall.allowedUDPPorts = [ ]; - - networking.useNetworkd = true; systemd.network = { config.routeTables = { diff --git a/machines/photo01/photoprism.nix b/machines/photo01/photoprism.nix index 5398c5d..661a913 100644 --- a/machines/photo01/photoprism.nix +++ b/machines/photo01/photoprism.nix @@ -1,7 +1,4 @@ -{ - pkgs, - ... -}: +{ pkgs, ... }: let port = 2342;