Merge branch 'cscherrNT-master'
This commit is contained in:
commit
b3ae39a830
|
@ -78,9 +78,13 @@ autocmd CursorHold * silent call CocActionAsync('highlight')
|
||||||
" Symbol renaming
|
" Symbol renaming
|
||||||
nmap <leader>rn <Plug>(coc-rename)
|
nmap <leader>rn <Plug>(coc-rename)
|
||||||
|
|
||||||
|
" Formatting all code
|
||||||
|
vmap <leader>F <Plug>(coc-format-selected)
|
||||||
|
nmap <leader>F <Plug>(coc-format-selected)
|
||||||
|
|
||||||
" Formatting selected code
|
" Formatting selected code
|
||||||
xmap <leader>f <Plug>(coc-format-selected)
|
xmap <leader>f :call CocActionAsync('format')<CR>
|
||||||
nmap <leader>f <Plug>(coc-format-selected)
|
nmap <leader>f :call CocActionAsync('format')<CR>
|
||||||
|
|
||||||
augroup mygroup
|
augroup mygroup
|
||||||
autocmd!
|
autocmd!
|
||||||
|
|
|
@ -14,7 +14,7 @@ set autoindent " indent a new line the same amount as the line just
|
||||||
set number " add line numbers
|
set number " add line numbers
|
||||||
set wildmode=longest,list " get bash-like tab completions
|
set wildmode=longest,list " get bash-like tab completions
|
||||||
set cc=100 " set an 100 column border for good coding style
|
set cc=100 " set an 100 column border for good coding style
|
||||||
set mouse=a " enable mouse click
|
set mouse=hr " enable mouse for help file editing and hitting prompts
|
||||||
set cursorline " highlight current cursor line
|
set cursorline " highlight current cursor line
|
||||||
set ttyfast " Speed up scrolling in Vim
|
set ttyfast " Speed up scrolling in Vim
|
||||||
set fdm=indent " folding method syntax
|
set fdm=indent " folding method syntax
|
||||||
|
|
|
@ -122,6 +122,8 @@ runtime coc.vim
|
||||||
|
|
||||||
" slime (sends stuff to other programs, like ipython)
|
" slime (sends stuff to other programs, like ipython)
|
||||||
let g:slime_target = "neovim"
|
let g:slime_target = "neovim"
|
||||||
|
nmap <C-c>a ggvG:SlimeSend<CR>
|
||||||
|
nmap <leader>cs :SlimeConfig<CR>
|
||||||
|
|
||||||
"------------------------------------------------------
|
"------------------------------------------------------
|
||||||
lua << EOF
|
lua << EOF
|
||||||
|
@ -190,9 +192,4 @@ dimensions = {
|
||||||
vim.keymap.set('n', '<F12>', '<CMD>lua require("FTerm").toggle()<CR>')
|
vim.keymap.set('n', '<F12>', '<CMD>lua require("FTerm").toggle()<CR>')
|
||||||
vim.keymap.set('t', '<F12>', '<C-\\><C-n><CMD>lua require("FTerm").toggle()<CR>')
|
vim.keymap.set('t', '<F12>', '<C-\\><C-n><CMD>lua require("FTerm").toggle()<CR>')
|
||||||
|
|
||||||
-- slime
|
|
||||||
-- get id of a terminal, FloatTerm is usually 7, but I should rice this more
|
|
||||||
vim.g.slime_get_jobid = function()
|
|
||||||
return 7
|
|
||||||
end
|
|
||||||
EOF
|
EOF
|
||||||
|
|
Loading…
Reference in New Issue