From a3a6ad305ffb21328c8e4bc1a8a46e7d6b856d37 Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Tue, 2 Jun 2026 18:25:30 +0100 Subject: [PATCH] nixos/displayManager: interpolate option paths in docs + errors --- nixos/modules/services/display-managers/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/display-managers/default.nix b/nixos/modules/services/display-managers/default.nix index 418db90e7cc6..e3eb882ec2f8 100644 --- a/nixos/modules/services/display-managers/default.nix +++ b/nixos/modules/services/display-managers/default.nix @@ -1,5 +1,6 @@ { config, + options, lib, pkgs, ... @@ -7,6 +8,7 @@ let cfg = config.services.displayManager; + opts = options.services.displayManager; installedSessions = pkgs.runCommand "desktops" @@ -79,7 +81,7 @@ in default = config.user != null; defaultText = lib.literalExpression "config.${options.user} != null"; description = '' - Automatically log in as {option}`autoLogin.user`. + Automatically log in as {option}`${options.user}`. ''; }; @@ -185,14 +187,14 @@ in { assertion = cfg.autoLogin.enable -> cfg.autoLogin.user != null; message = '' - services.displayManager.autoLogin.enable requires services.displayManager.autoLogin.user to be set + `${opts.autoLogin}.enable` requires `${opts.autoLogin}.user` to be set ''; } { assertion = cfg.defaultSession == null || lib.elem cfg.defaultSession cfg.sessionData.sessionNames; message = '' Default graphical session, '${toString cfg.defaultSession}', not found. - Valid names for 'services.displayManager.defaultSession' are: + Valid names for `${opts.defaultSession}` are: ${lib.concatStringsSep "\n " cfg.sessionData.sessionNames} ''; }