summaryrefslogtreecommitdiff
path: root/nvim
diff options
context:
space:
mode:
authorzachir <zachir@librem.one>2023-02-09 21:07:06 -0600
committerzachir <zachir@librem.one>2023-02-09 21:07:06 -0600
commit7a2dd5235800003487d43c57d1b76847c692bce4 (patch)
tree8d96101718e456180a6c6df40182a3e5dfe7e5cd /nvim
parent590e65f30f0478d7345be93191dc8bbe151c8a55 (diff)
parent9c096aa3d0e26537228489f3c522070454d96436 (diff)
merge updates
Diffstat (limited to 'nvim')
-rw-r--r--nvim/init.vim10
1 files changed, 7 insertions, 3 deletions
diff --git a/nvim/init.vim b/nvim/init.vim
index b5831c2..2ebefca 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -76,7 +76,7 @@ set conceallevel=2
let mapleader="'"
" emmet {{{
-let g:user_emmet_leader_key=';'
+let g:user_emmet_leader_key='+'
" }}}
" zig config {{{
@@ -246,10 +246,14 @@ vnoremap <C-h> <C-w>h
vnoremap <C-j> <C-w>j
vnoremap <C-k> <C-w>k
vnoremap <C-l> <C-w>l
+" these may go away soon
noremap <leader>xx :q<CR>
noremap <leader>x! :q!<CR>
-noremap <leader>xw :wq<CR>
-noremap <leader>w :w<CR>
+" these are the new standard
+noremap <leader>qq :q<CR>
+noremap <leader>q! :q!<CR>
+noremap <leader>wq :wq<CR>
+noremap <leader>ww :w<CR>
" escape for term windows
tnoremap <Esc> <C-\><C-n>