greetd: unwrap command, fix issue

This commit is contained in:
NullBite 2024-03-20 21:21:39 -04:00
parent 9fad947963
commit 27b88eb931
Signed by: nullbite
GPG Key ID: 6C4D545385D4925A

View File

@ -20,15 +20,11 @@ in
(lib.mkIf cfg.presets.tuigreet.enable { (lib.mkIf cfg.presets.tuigreet.enable {
command = let command = let
st = cfg.settings; st = cfg.settings;
# i don't know if/how the default command is quoted so this will avoid any ambiguity
wrappedCommand = pkgs.writeShellScript "tuigreet-default-command" ''
exec ${lib.escapeShellArgs st.command}
'';
args = [ "${pkgs.greetd.tuigreet}/bin/tuigreet" "--asterisks" "--remember" "--remember-session" args = [ "${pkgs.greetd.tuigreet}/bin/tuigreet" "--asterisks" "--remember" "--remember-session"
"--sessions" "${xsessions}:${wayland-sessions}" ] "--sessions" "${xsessions}:${wayland-sessions}" ]
++ optionalsSet st.greeting [ "--greeting" st.greeting ] ++ optionalsSet st.greeting [ "--greeting" st.greeting ]
++ optional st.time "--time" ++ optional st.time "--time"
++ optionalsSet st.command [ "--cmd" wrappedCommand ]; ++ optionalsSet st.command [ "--cmd" (lib.escapeShellArg st.command) ];
in lib.escapeShellArgs args; in lib.escapeShellArgs args;
}) })