summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--init.vim28
1 files changed, 21 insertions, 7 deletions
diff --git a/init.vim b/init.vim
index cbb6d59..45bfeaf 100644
--- a/init.vim
+++ b/init.vim
@@ -91,6 +91,7 @@ noremap <leader>p <plug>(SynStack)
" Way to find files.
noremap <leader>ff <cmd>Telescope find_files<cr>
+noremap <M-f> <cmd>Telescope find_files<cr>
inoremap <C-+> <Plug>(vsnip-expand)
@@ -105,13 +106,12 @@ augroup InitVim
au!
autocmd BufRead *.java,*.c,*.cpp,*.cxx,*.hs TSBufEnable highlight
- " Automatically start insert mode when opening a new terminal.
- autocmd TermOpen * startinsert
-
- " When entering a terminal, automatically start "insert" and feed the escape
- " key. This ensures the ZSH line-reader is in "normal" mode. I have
- " integration with zsh to navigate vim panes from the zsh line editor.
- autocmd BufEnter term://* startinsert | call feedkeys("\x1b")
+ " Automatically stop highligting things when leaving insert mode. If I want
+ " the highlight back, I can just hit 'n' and it will come back.
+ "
+ " I don't know why it can't just be 'noh' and why I have to do this feedkeys
+ " nonsense, but there appears to be a bug of some kind.
+ autocmd InsertLeave * call feedkeys("\<cmd>noh\<cr>")
autocmd TextYankPost *
\ lua require'vim.highlight'.on_yank(
@@ -149,6 +149,20 @@ noremap <C-w>. <cmd>lua require('windownav').goto_terminal()<cr>
noremap <C-w>I <cmd>lua require('windownav').goto_initvim()<cr>
noremap <C-w>' <cmd>lua require('windownav').goto_lastwin()<cr>
+nnoremap <M-t> <cmd>term<cr>
+nnoremap <M-S-T> <cmd>TERM<cr>
+
+nmap œ <leader>k
+nmap ï <leader>j
+omap œ <leader>k
+omap ï <leader>j
+omap aœ a<leader>k
+omap aï a<leader>j
+omap iœ i<leader>k
+omap iï i<leader>j
+vmap œ <leader>k
+vmap ï <leader>j
+
set textwidth=80
set colorcolumn=+1
if has('rneovim')