From 860db540f81d7adf60d51f6453c804df2a34b670 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Tue, 2 Jun 2026 18:42:17 +0100
Subject: [PATCH] nixos/displayManager: improve defaultSession error

---
 nixos/modules/services/display-managers/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/display-managers/default.nix b/nixos/modules/services/display-managers/default.nix
index e3eb882ec2f8..20261704b488 100644
--- a/nixos/modules/services/display-managers/default.nix
+++ b/nixos/modules/services/display-managers/default.nix
@@ -10,6 +10,8 @@ let
   cfg = config.services.displayManager;
   opts = options.services.displayManager;
 
+  toPretty = lib.generators.toPretty { };
+
   installedSessions =
     pkgs.runCommand "desktops"
       {
@@ -193,9 +195,9 @@ in
       {
         assertion = cfg.defaultSession == null || lib.elem cfg.defaultSession cfg.sessionData.sessionNames;
         message = ''
-          Default graphical session, '${toString cfg.defaultSession}', not found.
+          Default graphical session, ${toPretty cfg.defaultSession}, not found. Definitions:${lib.options.showDefs opts.defaultSession.definitionsWithLocations}.
           Valid names for `${opts.defaultSession}` are:
-            ${lib.concatStringsSep "\n    " cfg.sessionData.sessionNames}
+              ${lib.concatMapStringsSep "\n    " toPretty cfg.sessionData.sessionNames}
         '';
       }
     ];