diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 31be2be..f029a1b 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -126,6 +126,8 @@ ;; uncomment the following line. Note that this must ;; be done before font settings! (Emacs 20) (setq w32-enable-italics t) +(when (eq window-system 'w32) + (setq tramp-default-method "plink")) ;; Shut off annoying sound (if (fboundp 'set-message-beep) (set-message-beep 'silent)) diff --git a/vscode/settings.json b/vscode/settings.json index d822095..5342261 100644 --- a/vscode/settings.json +++ b/vscode/settings.json @@ -23,8 +23,14 @@ "editor.formatOnSaveTimeout": 1500, "workbench.colorTheme": "Monokai", "window.zoomLevel": 1, - "terminal.integrated.shell.windows": "C:\\WINDOWS\\Sysnative\\wsl.exe", + "terminal.integrated.shell.windows": "C:\\WINDOWS\\System32\\cmd.exe", "C_Cpp.clang_format_fallbackStyle": "llvm", "latex-workshop.view.pdf.viewer": "tab", - "glitch.token": "687fb628-3a2e-4405-9bfb-49fc51068fbb" + "glitch.token": "687fb628-3a2e-4405-9bfb-49fc51068fbb", + "[json]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[javascript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + } }