From 27b88eb931c98a447ec044bf3cc5fb8d92859d59 Mon Sep 17 00:00:00 2001 From: NullBite Date: Wed, 20 Mar 2024 21:21:39 -0400 Subject: [PATCH] greetd: unwrap command, fix issue --- system/programs/greetd.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/system/programs/greetd.nix b/system/programs/greetd.nix index bebe241..3ae5a5a 100644 --- a/system/programs/greetd.nix +++ b/system/programs/greetd.nix @@ -20,15 +20,11 @@ in (lib.mkIf cfg.presets.tuigreet.enable { command = let 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" "--sessions" "${xsessions}:${wayland-sessions}" ] ++ optionalsSet st.greeting [ "--greeting" st.greeting ] ++ optional st.time "--time" - ++ optionalsSet st.command [ "--cmd" wrappedCommand ]; + ++ optionalsSet st.command [ "--cmd" (lib.escapeShellArg st.command) ]; in lib.escapeShellArgs args; })