diff --git a/vimrc.d/01-basic.vim b/vimrc.d/01-basic.vim
index ce248cd..7d4ba11 100644
--- a/vimrc.d/01-basic.vim
+++ b/vimrc.d/01-basic.vim
@@ -50,14 +50,12 @@ endif
 " The fish shell is not very compatible to other shells and unexpectedly
 " breaks things that use 'shell'.
 if &shell =~# 'fish$'
-  set shell=/bin/bash
+    set shell=/bin/bash
 endif
 
 if has('win32')
     set shell=pwsh.exe
-    set shellcmdflag=-command
-    set shellquote=\"
-    set shellxquote=
+    set shellcmdflag=-nop\ -c
 endif
 
 " Put all temporary files under the same directory.