nixos/greetd: use services.displayManager.sessionData.desktops

thiagokokada · Aug 10, 2024 · f1369c6 · f1369c6
1 parent 71a02fd
commit f1369c6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/nixos/desktop/greetd.nix b/nixos/desktop/greetd.nix
@@ -26,9 +26,7 @@
         settings = {
           default_session =
             let
-              genSessionsFor =
-                path:
-                lib.concatStringsSep ":" (map (s: "${s}/${path}") config.services.displayManager.sessionPackages);
+              inherit (config.services.displayManager.sessionData) desktops;
             in
             {
               command = lib.concatStringsSep " " [
@@ -37,9 +35,12 @@
                 "--remember-session"
                 "--time"
                 "--sessions"
-                # We can't know if the sessions inside sessionPackages are for
-                # X or Wayland, so add both to path
-                "${genSessionsFor "share/xsessions"}:${genSessionsFor "share/wayland-sessions"}"
+                "${lib.concatStringsSep ":" (
+                  builtins.map (path: "${desktops}/${path}") [
+                    "/share/xsessions"
+                    "/share/wayland-sessions"
+                  ]
+                )}"
               ];
             };
         };

diff --git a/overlays/default.nix b/overlays/default.nix
@@ -86,8 +86,7 @@ outputs.lib.recursiveMergeAttrs [
     sx =
       with prev;
       sx.overrideAttrs (oldAttrs: {
-        postInstall = (
-          (oldAttrs.postInstall or "")
+        postInstall = (oldAttrs.postInstall or "")
           +
             #bash
             ''
@@ -99,8 +98,7 @@ outputs.lib.recursiveMergeAttrs [
                   exec = "sx";
                 }
               }/share/applications/sx.desktop
-            ''
-        );
+            '';
 
         passthru = (oldAttrs.passhtru or { }) // {
           providedSessions = [ "sx" ];