update stuff

This commit is contained in:
doyle 2020-11-03 14:23:01 +11:00
parent 0efddf9443
commit 4be0a0c4e6
4 changed files with 7 additions and 11 deletions

View File

@ -16,6 +16,7 @@ Plug 'https://github.com/tpope/vim-fugitive'
Plug 'https://github.com/bfrg/vim-cpp-modern'
Plug 'https://github.com/skywind3000/asyncrun.vim'
Plug 'https://github.com/Yggdroot/LeaderF'
Plug 'https://github.com/rhysd/vim-clang-format'
" Themes
Plug 'https://github.com/tomasr/molokai'
@ -210,13 +211,8 @@ noremap <C-F> :<C-U><C-R>=printf("Leaderf! rg -e %s ", expand("<cword>"))<CR>
" ==============================================================================
" Clang Format
" ==============================================================================
if s:running_windows
map <C-I> :py3f $home\vimfiles\clang-format.py<CR>
imap <C-I> <ESC>:py3f $home\vimfiles\clang-format.py<CR>i
else
map <C-I> :py3f ~/.vim/clang-format.py<CR>
imap <C-I> <ESC>:py3f ~/.vim/clang-format.py<CR>i
endif
map <C-I> :ClangFormat<CR>
imap <C-I> <ESC>:ClangFormat<CR>i
" ==============================================================================
" Compiling / AsyncRun

View File

@ -17,7 +17,7 @@
:: %ccall% "/customOption" "command/program"
@echo off
call %cmder_root%\..\Tools\WPy64-3902\scripts\env.bat
set PATH=%cmder_root%\..\Tools\zig-x86_64\zig-windows-x86_64-0.6.0;%cmder_root%\..\Tools\WPy64-3902\python-3.9.0.amd64;%PATH%
set HOME=%cmder_root%\..\Home
set HOMEPATH=%cmder_root%\..\Home
set USERPROFILE=%cmder_root%\..\Home

View File

@ -2,5 +2,5 @@ rmdir /Q /S Cmder
rmdir /Q /S Tools/winpython39_x64
rmdir /Q /S Tools/GVim
rmdir /Q /S Tools/Compiler/zig-x86_64
rmdir /Q /S Tools/Compiler/generate_msvc17_toolchain.bat
del Tools/Compiler/generate_msvc17_toolchain.bat
rmdir /Q /S GVim

View File

@ -130,7 +130,7 @@ set zig_version=0.6.0
set zig_zip=zig-windows-x86_64-%zig_version%.zip
set zig_url=https://ziglang.org/download/%zig_version%/%zig_zip%
set zig_zip_installer=%installer_root%\win32_%zig_zip%
set zig_zip_install_path=%compiler_root%\zig-x86_64
set zig_zip_install_path=%compiler_root%\zig-windows-x86_64-%zig_version%
echo - Downloading from %zig_url% to %zig_zip_installer%
if not exist "%zig_zip_installer%" powershell -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; Invoke-WebRequest %zig_url% -OutFile %zig_zip_installer%"
@ -138,7 +138,7 @@ if not exist "%zig_zip_installer%" echo Failed to download Zig, exiting.
if not exist "%zig_zip_installer%" goto :eof
echo - Unzip %zig_zip_installer% to %zig_zip_install_path%
if not exist %zig_zip_install_path% %installer_root%\win32_7za.exe x -y -o%zig_zip_install_path% %zig_zip_installer% > NUL
if not exist %zig_zip_install_path% %installer_root%\win32_7za.exe x -y -o%compiler_root% %zig_zip_installer% > NUL
REM
REM Python