From 8eb86bd3eb0901416692c9d4d5ea6c1fdc77dd14 Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Mon, 11 Mar 2024 16:48:07 +0100 Subject: [PATCH] Cleanup env vars --- flake.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 9e2d1b9..ba63111 100644 --- a/flake.nix +++ b/flake.nix @@ -34,9 +34,6 @@ { enterShell = '' export PATH=$PATH:$DEVENV_ROOT/tooling/bin/ - export PGPORT=$(($WEBPORT + 100)) - export PROJECT_DIR=$(pwd) - export WEBPORT=$(($RANDOM + 1100)) ln -sf ${config.process-managers.process-compose.configFile} ${config.env.DEVENV_ROOT}/process-compose.yml ''; env = { @@ -48,6 +45,7 @@ # to locate them, e.g. # nix-locate -w --top-level --at-root /lib/libudev.so.1 ]; + WEBPORT = "8080"; }; languages.python = { enable = true; @@ -63,7 +61,7 @@ # https://github.com/cachix/devenv/blob/main/examples/process-compose/devenv.nix processes = { webserver = { - exec = "poetry run python ./src/manage.py runserver 0.0.0.0:$WEBPORT"; + exec = "poetry run python ./src/manage.py runserver 0.0.0.0:${config.env.WEBPORT}"; process-compose.depends_on = { setup = { condition = "process_completed_successfully";