From 486806153227b39a4fef1f237fad3718f4f10857 Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Fri, 10 Apr 2026 15:14:02 -0700
Subject: pop-os/emacs: Fix prodigy definitions

Only apply them after prodigy gets loaded.
---
 oni/home/config/pop-os/emacs.el | 75 +++++++++++++++++++++--------------------
 1 file changed, 38 insertions(+), 37 deletions(-)

diff --git a/oni/home/config/pop-os/emacs.el b/oni/home/config/pop-os/emacs.el
index 658c2f2..6b13433 100644
--- a/oni/home/config/pop-os/emacs.el
+++ b/oni/home/config/pop-os/emacs.el
@@ -1309,40 +1309,41 @@ Optional argument STOPP means stop on any defect."
 
 ;;; Prodigy services
 
-(prodigy-define-tag
-  :name 'tunnel
-  :command "~/code/diamond-interactive/social-api/toolbox/connect_db.sh"
-  :args (lambda (&rest args)
-          (let ((service (map-elt args :service)))
-            (list "-e"
-                  (if (prodigy-service-tagged-with? service 'production)
-                      "prd"
-                    "stg")
-                  "-a"
-                  (cond
-                   ((prodigy-service-tagged-with? service 'chanced)
-                    "chanced")
-                   ((prodigy-service-tagged-with? service 'punt)
-                    "punt")
-                   (t (error "Unknown project")))
-                  "-k"
-                  (expand-file-name "~/.ssh/id_ed25519.pub"))))
-  :cwd "~/code/diamond-interactive/social-api"
-  :stop-signal 'kill
-  :ready-message "Waiting for connections...")
-
-(prodigy-define-service
-  :name "Chanced Production Database Connection"
-  :tags '(chanced production tunnel))
-
-(prodigy-define-service
-  :name "Chanced Staging Database Connection"
-  :tags '(chanced staging tunnel))
-
-(prodigy-define-service
-  :name "Punt Production Database Connection"
-  :tags '(punt production tunnel))
-
-(prodigy-define-service
-  :name "Punt Staging Database Connection"
-  :tags '(punt staging tunnel))
+(with-eval-after-load 'prodigy
+  (prodigy-define-tag
+    :name 'tunnel
+    :command "~/code/diamond-interactive/social-api/toolbox/connect_db.sh"
+    :args (lambda (&rest args)
+            (let ((service (map-elt args :service)))
+              (list "-e"
+                    (if (prodigy-service-tagged-with? service 'production)
+                        "prd"
+                      "stg")
+                    "-a"
+                    (cond
+                     ((prodigy-service-tagged-with? service 'chanced)
+                      "chanced")
+                     ((prodigy-service-tagged-with? service 'punt)
+                      "punt")
+                     (t (error "Unknown project")))
+                    "-k"
+                    (expand-file-name "~/.ssh/id_ed25519.pub"))))
+    :cwd "~/code/diamond-interactive/social-api"
+    :stop-signal 'kill
+    :ready-message "Waiting for connections...")
+
+  (prodigy-define-service
+    :name "Chanced Production Database Connection"
+    :tags '(chanced production tunnel))
+
+  (prodigy-define-service
+    :name "Chanced Staging Database Connection"
+    :tags '(chanced staging tunnel))
+
+  (prodigy-define-service
+    :name "Punt Production Database Connection"
+    :tags '(punt production tunnel))
+
+  (prodigy-define-service
+    :name "Punt Staging Database Connection"
+    :tags '(punt staging tunnel)))
-- 
cgit v1.3-2-g0d8e