summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2014-01-17 09:27:22 -0500
committerShea Levy <shea@shealevy.com>2014-01-17 09:28:19 -0500
commit7f15b0c1320f08898e3417fe5cd0ea207b534356 (patch)
tree09e75b213133ec93ff9b2fe0cc6c0c77f3d6f960 /nixos
parent0915582af9c8d7d38cc8a6cfa33c95cb15022be8 (diff)
parentbadb4753e48b80b95bf9688b6fff153a92ec48c3 (diff)
downloadnixpkgs-7f15b0c1320f08898e3417fe5cd0ea207b534356.tar
nixpkgs-7f15b0c1320f08898e3417fe5cd0ea207b534356.tar.gz
nixpkgs-7f15b0c1320f08898e3417fe5cd0ea207b534356.tar.bz2
nixpkgs-7f15b0c1320f08898e3417fe5cd0ea207b534356.tar.lz
nixpkgs-7f15b0c1320f08898e3417fe5cd0ea207b534356.tar.xz
nixpkgs-7f15b0c1320f08898e3417fe5cd0ea207b534356.tar.zst
nixpkgs-7f15b0c1320f08898e3417fe5cd0ea207b534356.zip
Merge branch 'xprofile' of git://github.com/pSub/nixpkgs into master
Allow the user to execute commands at the beginning of the X session.

Signed-off-by: Shea Levy <shea@shealevy.com>
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/x11/display-managers/default.nix5
1 files changed, 5 insertions, 0 deletions
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 80f559bddc4..575386bac0a 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -103,6 +103,11 @@ let
 
       ${cfg.displayManager.sessionCommands}
 
+      # Allow the user to execute commands at the beginning of the X session.
+      if test -f ~/.xprofile; then
+          source ~/.xprofile
+      fi
+
       # Allow the user to setup a custom session type.
       if test -x ~/.xsession; then
           exec ~/.xsession