From 006ae6079a2897f94bacf5037fdba867df95b5dd Mon Sep 17 00:00:00 2001
From: Richie Cahill <Richie@tmmworkshop.com>
Date: Fri, 29 May 2026 20:15:51 -0400
Subject: [PATCH] moved nornsight off my_python

---
 overlays/default.nix                  |  1 -
 systems/jeeves/services/nornsight.nix | 28 +++++++++++++++++++++++++--
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/overlays/default.nix b/overlays/default.nix
index 42b7882..ee5a252 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -44,7 +44,6 @@
         tiktoken
         tinytuya
         typer
-        uvicorn
         websockets
       ]
     );
diff --git a/systems/jeeves/services/nornsight.nix b/systems/jeeves/services/nornsight.nix
index 9800016..d363c98 100644
--- a/systems/jeeves/services/nornsight.nix
+++ b/systems/jeeves/services/nornsight.nix
@@ -3,6 +3,12 @@ let
   vars = import ../vars.nix;
   stateDir = "${vars.services}/nornsight";
   appDir = "${stateDir}/app";
+  binPath = pkgs.lib.makeBinPath [
+    pkgs.binutils
+    pkgs.libpq
+    pkgs.postgresql
+    pkgs.stdenv.cc
+  ];
   libraryPath = pkgs.lib.makeLibraryPath [
     pkgs.libpq
     pkgs.postgresql.lib
@@ -27,14 +33,20 @@ in
 
     environment = {
       HOME = stateDir;
+      UV_CACHE_DIR = "${stateDir}/.cache/uv";
+      UV_PROJECT_ENVIRONMENT = "${appDir}/.venv";
+      UV_PYTHON = "${pkgs.python313}/bin/python3.13";
+      UV_PYTHON_DOWNLOADS = "never";
       LD_LIBRARY_PATH = libraryPath;
-      PYTHONPATH = appDir;
+      LIBRARY_PATH = libraryPath;
+      PSYCOPG_IMPL = "python";
     };
 
     path = with pkgs; [
       bash
       coreutils
       git
+      uv
     ];
 
     serviceConfig = {
@@ -56,6 +68,9 @@ in
 
     script = ''
       set -eu
+      export PATH="${binPath}:$PATH"
+      export LD_LIBRARY_PATH="${libraryPath}:''${LD_LIBRARY_PATH:-}"
+      export LIBRARY_PATH="${libraryPath}:''${LIBRARY_PATH:-}"
 
       : "''${NORN_SIGHT_REPO_URL:?NORN_SIGHT_REPO_URL is required}"
       branch="''${NORN_SIGHT_BRANCH:-main}"
@@ -77,7 +92,16 @@ in
       fi
 
       cd "${appDir}"
-      exec ${pkgs.my_python}/bin/python -m uvicorn pipelines.web.main:app --reload --host 0.0.0.0 --port 8001
+      uv sync --upgrade
+      uv run python - <<'PY'
+      import ctypes.util
+      import os
+
+      print(f"LD_LIBRARY_PATH={os.environ.get('LD_LIBRARY_PATH')}")
+      print(f"LIBRARY_PATH={os.environ.get('LIBRARY_PATH')}")
+      print(f"libpq={ctypes.util.find_library('pq')}")
+      PY
+      exec uv run uvicorn pipelines.web.main:app --reload --host 0.0.0.0 --port 8001
     '';
   };
 }