From 20fe2fa5adc674426f54900b2889dc405e8ba32e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 24 May 2020 11:31:14 -0300
Subject: [PATCH 1/4] lumina.lumina: format with nixpkgs-fmt and sort
 dependence list

---
 pkgs/desktops/lumina/lumina/default.nix | 48 ++++++++++++-------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/pkgs/desktops/lumina/lumina/default.nix b/pkgs/desktops/lumina/lumina/default.nix
index fb5a0cbea5c1..842d077921d8 100644
--- a/pkgs/desktops/lumina/lumina/default.nix
+++ b/pkgs/desktops/lumina/lumina/default.nix
@@ -1,18 +1,18 @@
-{ stdenv,
-  mkDerivation,
-  fetchFromGitHub,
-  desktop-file-utils,
-  fluxbox,
-  numlockx,
-  qmake,
-  qtbase,
-  qtmultimedia,
-  qtsvg,
-  qttools,
-  qtx11extras,
-  xorg,
-  xscreensaver,
-  wrapGAppsHook
+{ stdenv
+, mkDerivation
+, fetchFromGitHub
+, desktop-file-utils
+, fluxbox
+, numlockx
+, qmake
+, qtbase
+, qtmultimedia
+, qtsvg
+, qttools
+, qtx11extras
+, xorg
+, xscreensaver
+, wrapGAppsHook
 }:
 
 mkDerivation rec {
@@ -33,19 +33,19 @@ mkDerivation rec {
   ];
 
   buildInputs = [
-    xorg.libxcb
+    desktop-file-utils
+    fluxbox # window manager for Lumina DE
+    numlockx # required for changing state of numlock at login
+    qtbase
+    qtmultimedia
+    qtsvg
+    qtx11extras
     xorg.libXcursor
     xorg.libXdamage
-    xorg.xcbutilwm
+    xorg.libxcb
     xorg.xcbutilimage
-    qtbase
-    qtsvg
-    qtmultimedia
-    qtx11extras
-    fluxbox
+    xorg.xcbutilwm
     xscreensaver
-    desktop-file-utils
-    numlockx
   ];
 
   patches = [

From 394462b1db62b075962b004c6f53cb16242a0e21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 25 May 2020 12:13:28 -0300
Subject: [PATCH 2/4] lumina.lumina: fix desktop files

---
 pkgs/desktops/lumina/lumina/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/desktops/lumina/lumina/default.nix b/pkgs/desktops/lumina/lumina/default.nix
index 842d077921d8..af79cb896360 100644
--- a/pkgs/desktops/lumina/lumina/default.nix
+++ b/pkgs/desktops/lumina/lumina/default.nix
@@ -67,6 +67,12 @@ mkDerivation rec {
     # Fix location of fluxbox styles
     substituteInPlace src-qt5/core-utils/lumina-config/pages/page_fluxbox_settings.cpp \
       --replace 'LOS::AppPrefix()+"share/fluxbox' "\"${fluxbox}/share/fluxbox"
+
+    # Fix desktop files
+    for i in $(grep -lir 'OnlyShowIn=Lumina' src-qt5); do
+      echo ===== $i
+      substituteInPlace $i --replace 'OnlyShowIn=Lumina' 'OnlyShowIn=X-Lumina'
+    done
   '';
 
   qmakeFlags = [

From ae59996dd97c84e8d401e4db477ac054444259d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 25 May 2020 12:14:38 -0300
Subject: [PATCH 3/4] lumina.lumina: desktop-file-utils is not needed

---
 pkgs/desktops/lumina/lumina/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/desktops/lumina/lumina/default.nix b/pkgs/desktops/lumina/lumina/default.nix
index af79cb896360..9ba8da82e535 100644
--- a/pkgs/desktops/lumina/lumina/default.nix
+++ b/pkgs/desktops/lumina/lumina/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , mkDerivation
 , fetchFromGitHub
-, desktop-file-utils
 , fluxbox
 , numlockx
 , qmake
@@ -33,7 +32,6 @@ mkDerivation rec {
   ];
 
   buildInputs = [
-    desktop-file-utils
     fluxbox # window manager for Lumina DE
     numlockx # required for changing state of numlock at login
     qtbase

From f78e757cf3b67d299c0358c6f7871311b9688dd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 24 May 2020 13:43:46 -0300
Subject: [PATCH 4/4] nixos/lumina: use xsession provided

---
 nixos/modules/services/x11/desktop-managers/lumina.nix | 9 +++------
 pkgs/desktops/lumina/lumina/default.nix                | 2 ++
 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 2224bcd5a2a5..419f5055d8be 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 9ba8da82e535..1b30b8cdb107 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 = ''