Ensure that slim's theme applies to slimlock

1 files changed, 9 insertions, 21 deletions

diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix
index b4f42ec7649c..cfe3ee532240 100644
--- a/nixos/modules/services/x11/display-managers/slim.nix
+++ b/nixos/modules/services/x11/display-managers/slim.nix
@@ -7,8 +7,6 @@ let
   dmcfg = config.services.xserver.displayManager;
 
   cfg = dmcfg.slim;
-  
-  slimPackage = cfg.package;
 
   slimConfig = pkgs.writeText "slim.cfg"
     ''
@@ -35,7 +33,7 @@ let
           ln -s * default
         '';
       };
-    in if cfg.theme == null then "${slimPackage}/share/slim/themes" else unpackedTheme;
+    in if cfg.theme == null then "${pkgs.slim}/share/slim/themes" else unpackedTheme;
 
 in
 
@@ -82,22 +80,6 @@ in
           the focus is placed on the password.
         '';
       };
-      
-      package = mkOption {
-        type = types.package;
-        default = pkgs.slim;
-        description = ''
-          Configure slim package.
-        '';
-        example = ''
-          pkgs.slim.override { 
-            theme = pkgs.fetchurl {
-              url = http://download.berlios.de/slim/slim-wave.tar.gz;
-              sha256 = "0ndr419i5myzcylvxb89m9grl2xyq6fbnyc3lkd711mzlmnnfxdy";
-            }; 
-          };
-        '';
-      };
 
       autoLogin = mkOption {
         type = types.bool;
@@ -125,9 +107,15 @@ in
           { SLIM_CFGFILE = slimConfig;
             SLIM_THEMESDIR = slimThemesDir;
           };
-        execCmd = "exec ${slimPackage}/bin/slim";
+        execCmd = "exec ${pkgs.slim}/bin/slim";
       };
 
+    services.xserver.displayManager.sessionCommands =
+      ''
+        # Export the config/themes for slimlock.
+        export SLIM_THEMESDIR=${slimThemesDir}
+      '';
+
     # Allow null passwords so that the user can login as root on the
     # installation CD.
     security.pam.services.slim = { allowNullPassword = true; startSession = true; };
@@ -135,7 +123,7 @@ in
     # Allow slimlock to work.
     security.pam.services.slimlock = {};
 
-    environment.systemPackages = [ slimPackage ];
+    environment.systemPackages = [ pkgs.slim ];
 
   };