diff --git a/Internal/os_nvim_init.vim b/Internal/os_nvim_init.vim index 095e43e..639d192 100644 --- a/Internal/os_nvim_init.vim +++ b/Internal/os_nvim_init.vim @@ -57,9 +57,10 @@ lua < RemedyBGOpenFile +nnoremap RemedyBGStartDebugging +nnoremap RemedyBGStopDebugging +nnoremap RemedyBGAddBreakpointAtFile +nnoremap RemedyBGRunToCursor + " FZF " ============================================================================== " Empty value to disable preview window altogether @@ -366,27 +370,21 @@ nnoremap cc FzfCommits nnoremap cb FzfBCommits nnoremap b FzfBuffers -function! PadAndTruncateLineTo80Function() +function! PadAndTruncateLineFunction() let line = getline('.') let line_length = strlen(line) - let padding = 80 - line_length + let padding = 100 - line_length let padding = max([padding, 0]) - let existing_space = line_length == 80 || match(line, ' $') != -1 + let existing_space = line_length == 100 || match(line, ' $') != -1 " Construct the new line with padding and a space before the padding let new_line = line . (existing_space ? '' : ' ') . repeat('=', padding - 1) call setline(line('.'), new_line) endfunction -command! PadAndTruncateLineTo80 :call PadAndTruncateLineTo80Function() -nnoremap :PadAndTruncateLineTo80 - -nnoremap RemedyBGOpenFile -nnoremap RemedyBGStartDebugging -nnoremap RemedyBGStopDebugging -nnoremap RemedyBGAddBreakpointAtFile -nnoremap RemedyBGRunToCursor +command! PadAndTruncateLine :call PadAndTruncateLineFunction() +nnoremap :PadAndTruncateLine " Map Ctrl+HJKL to navigate buffer window nmap :wincmd h @@ -414,23 +412,6 @@ nnoremap s :vs nnoremap :cn nnoremap :cp -" Clang Format -" ============================================================================== -map :py3file ~/clang-format.py - -" Compiler Error Formats -" ============================================================================== -" Error message formats thanks to -" https://forums.handmadehero.org/index.php/forum?view=topic&catid=4&id=704#3982 -set errorformat+=\\\ %#%f(%l\\\,%c):\ %m " MSVC: MSBuild -set errorformat+=\\\ %#%f(%l)\ :\ %#%t%[A-z]%#\ %m " MSVC: cl.exe -set errorformat+=\\\ %#%t%nxx:\ %m " MSVC: cl.exe, fatal errors is crudely implemented -set errorformat+=\\\ %#LINK\ :\ %m " MSVC: link.exe, can't find link library badly implemented -set errorformat+=\\\ %#%s\ :\ error\ %m " MSVC: link.exe, errors is badly implemented -set errorformat+=\\\ %#%s\ :\ fatal\ error\ %m " MSVC: link.exe, fatal errors is badly implemented -set errorformat+=\\\ %#%f(%l\\\,%c-%*[0-9]):\ %#%t%[A-z]%#\ %m " MSVC: HLSL fxc.exe -set errorformat+=%\\%%(CTIME%\\)%\\@=%m " ctime.exe -stats - " Vim Dispatch " ============================================================================== let s:running_windows = has("win16") || has("win32") || has("win64") diff --git a/Win/Scripts/remedybg.bat b/Win/Scripts/remedybg.bat index 14f7adf..070e95f 100644 --- a/Win/Scripts/remedybg.bat +++ b/Win/Scripts/remedybg.bat @@ -8,5 +8,5 @@ setlocal for /f "delims=" %%a in ('where "$desired_path:%desired_exe%"') do ( set "exe_to_use=%%a") echo [DEVENVER] Executing script "%~dpnx0" with "%exe_to_use%" - call %desired_exe% %* + start /B %desired_exe% %* endlocal diff --git a/devenver.py b/devenver.py index 1081ceb..a9122b9 100644 --- a/devenver.py +++ b/devenver.py @@ -801,7 +801,7 @@ def run(user_app_list, devenv_script_buffer += "set path=%~dp0Symlinks;%PATH%\n" devenv_script_buffer += "set path=%~dp0Scripts;%PATH%\n" else: - devenv_script_buffer += f"devenver_root=\"$( cd -- $( dirname -- \"${{BASH_SOURCE[0]}}\" ) &> /dev/null && pwd )\":$PATH\n" + devenv_script_buffer += f"export devenver_root=\"$( cd -- $( dirname -- \"${{BASH_SOURCE[0]}}\" ) &> /dev/null && pwd )\"\n" devenv_script_buffer += f"PATH=\"$( cd -- $( dirname -- \"${{BASH_SOURCE[0]}}\" ) &> /dev/null && pwd )/Scripts\":$PATH\n" devenv_script_buffer += f"PATH=\"$( cd -- $( dirname -- \"${{BASH_SOURCE[0]}}\" ) &> /dev/null && pwd )/Symlinks\":$PATH\n" diff --git a/install.py b/install.py index 5a5aab6..50d526f 100644 --- a/install.py +++ b/install.py @@ -414,6 +414,7 @@ pause # Install left-overs # -------------------------------------------------------------------------- devenver.print_header("Install configuration files") + shutil.copy(internal_dir / "os_clang_format_style_file", install_dir / "_clang-format") # Copy init.vim to NVIM directory nvim_init_dir = ""