From 3d92a52676d6579061a8944bfc25346246e855c9 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 25 Nov 2025 08:19:51 +0530
Subject: [PATCH] When expanding environment variables in listen_on allow the
 env directive to take effect

---
 docs/changelog.rst | 3 +++
 kitty/main.py      | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 610fa93c6..994926b07 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -168,6 +168,9 @@ Detailed list of changes
 - Have the :option:`kitty --start-as` flag be respected when used with
   :option:`kitty --single-instance` (:iss:`9228`)
 
+- When expanding environment variables in :opt:`listen_on` allow the :opt:`env`
+  directive to take effect
+
 
 0.44.0 [2025-11-03]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/kitty/main.py b/kitty/main.py
index 15564a099..23ecfb824 100644
--- a/kitty/main.py
+++ b/kitty/main.py
@@ -395,10 +395,10 @@ def setup_profiling() -> Generator[None, None, None]:
             print('To view the graphical call data, use: kcachegrind', cg)
 
 
-def expand_listen_on(listen_on: str, from_config_file: bool) -> str:
+def expand_listen_on(listen_on: str, from_config_file: bool, env: dict[str, str]) -> str:
     if from_config_file and listen_on == 'none':
         return ''
-    listen_on = expandvars(listen_on)
+    listen_on = expandvars(listen_on, env)
     if '{kitty_pid}' not in listen_on and from_config_file and listen_on.startswith('unix:'):
         listen_on += '-{kitty_pid}'
     listen_on = listen_on.replace('{kitty_pid}', str(os.getpid()))
@@ -478,8 +478,6 @@ def setup_environment(opts: Options, cli_opts: CLIOptions) -> None:
     if not cli_opts.listen_on:
         cli_opts.listen_on = opts.listen_on
         from_config_file = True
-    if cli_opts.listen_on:
-        cli_opts.listen_on = expand_listen_on(cli_opts.listen_on, from_config_file)
     if vars := opts.env.pop('read_from_shell', ''):
         import fnmatch
         import re
@@ -491,6 +489,8 @@ def setup_environment(opts: Options, cli_opts: CLIOptions) -> None:
                     if pat.match(k) is not None:
                         opts.env[k] = v
                         break
+    if cli_opts.listen_on:
+        cli_opts.listen_on = expand_listen_on(cli_opts.listen_on, from_config_file, opts.env)
     env = opts.env.copy()
     ensure_kitty_in_path()
     ensure_kitten_in_path()