From 32b10b4cfeb59001189c9155c532083008763af2 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 15 Sep 2018 22:49:53 +0200 Subject: [PATCH] xsession: add option `xsession.scriptPath` This option allows overriding the default script path `~/.xsession`. This is to allow session selection in the display manager. This option is not visible for now and is considered experimental. --- modules/xsession.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/modules/xsession.nix b/modules/xsession.nix index d55118e4..30da466f 100644 --- a/modules/xsession.nix +++ b/modules/xsession.nix @@ -15,6 +15,20 @@ in xsession = { enable = mkEnableOption "X Session"; + scriptPath = mkOption { + type = types.str; + default = ".xsession"; + example = ".xsession-hm"; + visible = false; + description = '' + Name of X session script. The default value will make NixOS + unconditionally use Home Manager for the graphical session. + To allow other sessions this must be set to a non-default + value, however then some system level configuration is + necessary to add Home Manager as a session manager. + ''; + }; + windowManager.command = mkOption { type = types.str; example = literalExample '' @@ -117,7 +131,7 @@ in export HM_XPROFILE_SOURCED=1 ''; - home.file.".xsession" = { + home.file.${cfg.scriptPath} = { executable = true; text = '' if [[ ! -v HM_XPROFILE_SOURCED ]]; then