Skip to content

Commit

Permalink
desktop: fix text flash on login/logout
Browse files Browse the repository at this point in the history
labwc output are now stored in temporary files, rather than previously
showing on the screen briefly. Also sets the session name as
ghaf-session rather than the long nix store path.

Signed-off-by: Humaid Alqasimi <[email protected]>
  • Loading branch information
humaidq-tii authored and brianmcgillion committed Nov 18, 2024
1 parent 713d13c commit ae85f2a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
12 changes: 7 additions & 5 deletions modules/desktop/graphics/labwc.config.nix
Original file line number Diff line number Diff line change
Expand Up @@ -252,15 +252,15 @@ let
}
'';

labwc-session = pkgs.writeShellApplication {
name = "labwc-session";
ghaf-session = pkgs.writeShellApplication {
name = "ghaf-session";

runtimeInputs = [
pkgs.labwc
autostart
];

text = "labwc -C /etc/labwc -s labwc-autostart";
text = "labwc -C /etc/labwc -s labwc-autostart >/tmp/session.labwc.log 2>&1";
};
in
{
Expand All @@ -272,13 +272,15 @@ in

"mako/config".text = makoConfig;

"greetd/environments".text = lib.mkAfter "${labwc-session}/bin/labwc-session\n";
"greetd/environments".text = lib.mkAfter "ghaf-session\n";
};

environment.systemPackages = [ ghaf-session ];

services.greetd.settings = {
initial_session = lib.mkIf (cfg.autologinUser != null) {
user = "ghaf";
command = "${labwc-session}/bin/labwc-session";
command = "ghaf-session";
};
};

Expand Down
2 changes: 1 addition & 1 deletion modules/desktop/graphics/login-manager.nix
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ in
};
in
{
command = "${pkgs.labwc}/bin/labwc -C /etc/labwc -s ${greeter-autostart}/bin/greeter-autostart";
command = "${pkgs.labwc}/bin/labwc -C /etc/labwc -s ${greeter-autostart}/bin/greeter-autostart >/tmp/greeter.labwc.log 2>&1";
};
};
};
Expand Down

0 comments on commit ae85f2a

Please sign in to comment.