diff --git a/flake.lock b/flake.lock index 06badd2f..ab42820f 100644 --- a/flake.lock +++ b/flake.lock @@ -215,11 +215,11 @@ "dracula-plymouth-src": { "flake": false, "locked": { - "lastModified": 1704576657, - "narHash": "sha256-nHirp6UMvBd4rMpXu5xWtBf9GN/jasHhZrUol6HGXpA=", + "lastModified": 1720656461, + "narHash": "sha256-pomh/1TJINqt59rle0vnuUKy7KJ3byloM+eQcW00jXo=", "owner": "matt1432", "repo": "dracula-plymouth", - "rev": "54c523dbae26bf68683f27cda79c92da87229ab0", + "rev": "6f7af346854ea967c3c45316cf5d3aac8491e6ad", "type": "github" }, "original": { diff --git a/modules/desktop/display-manager/default.nix b/modules/desktop/display-manager/default.nix index 45deb3c1..fede6555 100644 --- a/modules/desktop/display-manager/default.nix +++ b/modules/desktop/display-manager/default.nix @@ -1,4 +1,8 @@ -{config, ...}: let +{ + config, + pkgs, + ... +}: let cfg = config.roles.desktop; hyprland = @@ -10,6 +14,11 @@ .windowManager .hyprland .finalPackage; + + cmd = toString (pkgs.writeShellScript "hyprland-wrapper" '' + trap 'systemctl --user stop hyprland-session.target; sleep 1' EXIT + exec Hyprland >/dev/null + ''); in { imports = [ ./astal.nix @@ -23,12 +32,12 @@ in { enable = true; settings = { default_session = { - command = "Hyprland"; + command = cmd; user = "greeter"; }; initial_session = { - command = "Hyprland"; + command = cmd; user = cfg.user; }; };