diff --git a/hosts/nas/apps.nix b/hosts/nas/apps.nix index fac981a..243a8dd 100755 --- a/hosts/nas/apps.nix +++ b/hosts/nas/apps.nix @@ -5,6 +5,7 @@ # ./apps/crowdsec ./apps/jellyfin ./apps/jellyseerr + ./apps/netbootxyz ./apps/nextcloud ./apps/ollama ./apps/paperless @@ -22,8 +23,7 @@ free-games-claimer.enable = true; manyfold.enable = true; - - + netbootxyz = { enable = true; port = "4000"; diff --git a/modules/apps/netbootxyz/default.nix b/hosts/nas/apps/netbootxyz/default.nix similarity index 88% rename from modules/apps/netbootxyz/default.nix rename to hosts/nas/apps/netbootxyz/default.nix index 1dab31e..57fb3ef 100755 --- a/modules/apps/netbootxyz/default.nix +++ b/hosts/nas/apps/netbootxyz/default.nix @@ -17,6 +17,8 @@ in PUID = cfg.puid; PGID = cfg.pgid; TZ = cfg.timeZone; + WEB_APP_PORT = cfg.port; + NGINX_PORT = cfg.port2; }; }; }; diff --git a/modules/apps/netbootxyz/options.nix b/hosts/nas/apps/netbootxyz/options.nix similarity index 100% rename from modules/apps/netbootxyz/options.nix rename to hosts/nas/apps/netbootxyz/options.nix diff --git a/hosts/nas/apps/vert/default.nix b/hosts/nas/apps/vert/default.nix index f4762e2..a43dec0 100644 --- a/hosts/nas/apps/vert/default.nix +++ b/hosts/nas/apps/vert/default.nix @@ -2,11 +2,11 @@ { virtualisation.oci-containers.containers.vert = { autoStart = true; - image = "vert-sh/vert"; + image = "ghcr.io/vert-sh/vert"; ports = [ "9876:80" ]; environment = { - PUID = config.users.users.nix-apps.uid; - PGID = config.users.groups.jallen-nas.gid; + PUID = toString config.users.users.nix-apps.uid; + PGID = toString config.users.groups.jallen-nas.gid; TZ = "America/Chicago"; }; }; diff --git a/hosts/nas/networking.nix b/hosts/nas/networking.nix index ca4174a..3c90cba 100755 --- a/hosts/nas/networking.nix +++ b/hosts/nas/networking.nix @@ -13,6 +13,8 @@ let 10300 8127 9980 # onlyoffice + 4000 # netbootxyz + 4080 # netbootxyz ]; in { diff --git a/modules/default.nix b/modules/default.nix index 1da2090..9c0f896 100755 --- a/modules/default.nix +++ b/modules/default.nix @@ -5,7 +5,6 @@ ./apps/free-games-claimer ./apps/manyfold ./apps/mongodb - ./apps/netbootxyz ./apps/tdarr ./apps/your-spotify ]; diff --git a/modules/desktop-environments/cosmic/default.nix b/modules/desktop-environments/cosmic/default.nix index ebf4d38..e2975dd 100755 --- a/modules/desktop-environments/cosmic/default.nix +++ b/modules/desktop-environments/cosmic/default.nix @@ -1,9 +1,9 @@ { ... }: { - specialisation.cosmic.configuration = { + # specialisation.cosmic.configuration = { services = { desktopManager.cosmic.enable = true; displayManager.cosmic-greeter.enable = true; }; - }; + # }; }