summary refs log tree commit diff
diff options
context:
space:
mode:
authorJosé Romildo Malaquias <malaquias@gmail.com>2020-05-24 13:43:46 -0300
committerJosé Romildo Malaquias <malaquias@gmail.com>2020-05-25 12:16:48 -0300
commitf78e757cf3b67d299c0358c6f7871311b9688dd5 (patch)
tree5e4b22d4c41b0d5eb39fcfebb9d17a2898548f6e
parentae59996dd97c84e8d401e4db477ac054444259d2 (diff)
downloadnixpkgs-f78e757cf3b67d299c0358c6f7871311b9688dd5.tar
nixpkgs-f78e757cf3b67d299c0358c6f7871311b9688dd5.tar.gz
nixpkgs-f78e757cf3b67d299c0358c6f7871311b9688dd5.tar.bz2
nixpkgs-f78e757cf3b67d299c0358c6f7871311b9688dd5.tar.lz
nixpkgs-f78e757cf3b67d299c0358c6f7871311b9688dd5.tar.xz
nixpkgs-f78e757cf3b67d299c0358c6f7871311b9688dd5.tar.zst
nixpkgs-f78e757cf3b67d299c0358c6f7871311b9688dd5.zip
nixos/lumina: use xsession provided
-rw-r--r--nixos/modules/services/x11/desktop-managers/lumina.nix9
-rw-r--r--pkgs/desktops/lumina/lumina/default.nix2
2 files changed, 5 insertions, 6 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/lumina.nix b/nixos/modules/services/x11/desktop-managers/lumina.nix
index 2224bcd5a2a..419f5055d8b 100644
--- a/nixos/modules/services/x11/desktop-managers/lumina.nix
+++ b/nixos/modules/services/x11/desktop-managers/lumina.nix
@@ -23,12 +23,9 @@ in
 
   config = mkIf cfg.enable {
 
-    services.xserver.desktopManager.session = singleton {
-      name = "lumina";
-      start = ''
-        exec ${pkgs.lumina.lumina}/bin/start-lumina-desktop
-      '';
-    };
+    services.xserver.displayManager.sessionPackages = [
+      pkgs.lumina.lumina
+    ];
 
     environment.systemPackages =
       pkgs.lumina.preRequisitePackages ++
diff --git a/pkgs/desktops/lumina/lumina/default.nix b/pkgs/desktops/lumina/lumina/default.nix
index 9ba8da82e53..1b30b8cdb10 100644
--- a/pkgs/desktops/lumina/lumina/default.nix
+++ b/pkgs/desktops/lumina/lumina/default.nix
@@ -79,6 +79,8 @@ mkDerivation rec {
     "LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease"
   ];
 
+  passthru.providedSessions = [ "Lumina-DE" ];
+
   meta = with stdenv.lib; {
     description = "A lightweight, portable desktop environment";
     longDescription = ''