diff --git a/lua/options.lua b/lua/options.lua index 11affb7..69a1bf5 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -8,11 +8,11 @@ vim.api.nvim_exec2('language en_US', {}) -- Shell options -- Sets the shell to use for system() and ! commands in windows -if vim.fn.has 'win32' then - vim.opt.shell = 'pwsh' +if vim.fn.has 'win32' and vim.fn.has 'wsl' == 0 then + vim.opt.shell = vim.fn.executable 'pwsh' == 1 and 'pwsh' or 'powershell' vim.opt.shellcmdflag = '-NoLogo -NoProfile -ExecutionPolicy RemoteSigned -Command [Console]::InputEncoding=[Console]::OutputEncoding=[System.Text.Encoding]::UTF8;' - vim.opt.shellredir = '2>&1 | Out-File -Encoding UTF8 %s; exit $LastExitCode' + vim.opt.shellredir = '-RedirectStandardOutput %s -NoNewWindow -Wait' vim.opt.shellpipe = '2>&1 | Out-File -Encoding UTF8 %s; exit $LastExitCode' vim.opt.shellxquote = '' vim.opt.shellquote = ''