5 files changed, 42 insertions, 14 deletions
diff --git a/.config/nvim/bindings.vim b/.config/nvim/bindings.vim
index dbea3af..1957419 100644
--- a/.config/nvim/bindings.vim
+++ b/.config/nvim/bindings.vim
@@ -1,3 +1,5 @@
+call which_key#register('\', "g:which_key_map")
+let g:which_key_map = {}
 nnoremap c "_c
 nnoremap <M-;> :call NERDComment(0,"toggle")<CR>
 nnoremap <M-x> :
@@ -14,23 +16,39 @@ nnoremap <C-x>1 <C-w>o
 nnoremap <C-x>2 :sp<CR>
 nnoremap <C-x>3 :vsp<CR>
 nnoremap <C-x>0 <C-w>q
-nnoremap <silent> <leader>g :G<CR>
-nnoremap <silent> <leader>d :Vifm<CR>
+nnoremap <silent> <leader> :WhichKey '\'<CR>
+nnoremap <silent> <leader>g :FloatermNew lazygit<CR>
+let g:which_key_map.g = 'lazygit'
+nnoremap <silent> <leader>d :FloatermNew vifm<CR>
+let g:which_key_map.d = 'vifm'
+nnoremap <silent> <leader>v :FloatermNew vifm<CR>
+let g:which_key_map.v = 'vifm'
 nnoremap <silent> <leader>e :Files<CR>
+let g:which_key_map.e = 'fzf-files'
 nnoremap <silent> <leader>b :Buffers<CR>
+let g:which_key_map.b = 'fzf-buffers'
+nnoremap <silent> <leader>h :Startify<CR>
+let g:which_key_map.h = 'startify'
 nnoremap <silent> <leader>p :<C-u>CocList -A --normal yank<CR>
+let g:which_key_map.p = 'coc-paste'
 nnoremap <leader>s :w<CR>
-nnoremap <leader>w :w<CR>:bp<CR>:bd #<CR>
+let g:which_key_map.s = 'write-buffer'
+nnoremap <leader>k :w<CR>:bp<CR>:bd #<CR>
+let g:which_key_map.k = 'write-and-close-buffer'
 nnoremap <leader>x :w<CR>:bp<CR>:bd #<CR>
-nmap <leader>1 <Plug>AirlineSelectTab1
-nmap <leader>2 <Plug>AirlineSelectTab2
-nmap <leader>3 <Plug>AirlineSelectTab3
-nmap <leader>4 <Plug>AirlineSelectTab4
-nmap <leader>5 <Plug>AirlineSelectTab5
-nmap <leader>6 <Plug>AirlineSelectTab6
-nmap <leader>7 <Plug>AirlineSelectTab7
-nmap <leader>8 <Plug>AirlineSelectTab8
-nmap <leader>9 <Plug>AirlineSelectTab9
-nmap <leader>0 <Plug>AirlineSelectTab10
+let g:which_key_map.x = 'write-and-close-buffer'
+nmap <M-1> <Plug>AirlineSelectTab1
+nmap <M-2> <Plug>AirlineSelectTab2
+nmap <M-3> <Plug>AirlineSelectTab3
+nmap <M-4> <Plug>AirlineSelectTab4
+nmap <M-5> <Plug>AirlineSelectTab5
+nmap <M-6> <Plug>AirlineSelectTab6
+nmap <M-7> <Plug>AirlineSelectTab7
+nmap <M-8> <Plug>AirlineSelectTab8
+nmap <M-9> <Plug>AirlineSelectTab9
+nmap <M-0> <Plug>AirlineSelectTab10
 inoremap <expr> <C-j> pumvisible() ? "<C-n>" : "<C-j>"
 inoremap <expr> <C-k> pumvisible() ? "<C-p>" : "<C-k>"
+let g:floaterm_keymap_toggle	= '<F1>'
+let g:floaterm_keymap_prev		= '<F11>'
+let g:floaterm_keymap_next		= '<F12>'
diff --git a/.config/nvim/plug.vim b/.config/nvim/plug.vim
index 5b4a271..2fcfd83 100644
--- a/.config/nvim/plug.vim
+++ b/.config/nvim/plug.vim
@@ -5,6 +5,7 @@ Plug 'jceb/vim-orgmode'
 Plug 'jiangmiao/auto-pairs'
 Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
 Plug 'junegunn/fzf.vim'
+Plug 'liuchengxu/vim-which-key'
 Plug 'luochen1990/rainbow'
 Plug 'mbbill/undotree'
 Plug 'mg979/vim-visual-multi'
@@ -23,4 +24,6 @@ Plug 'tpope/vim-speeddating'
 Plug 'vifm/vifm.vim'
 Plug 'vim-airline/vim-airline'
 Plug 'vim-airline/vim-airline-themes'
+Plug 'voldikss/fzf-floaterm'
+Plug 'voldikss/vim-floaterm'
 call plug#end()
diff --git a/.config/nvim/plugins.vim b/.config/nvim/plugins.vim
index d597412..931d8c7 100644
--- a/.config/nvim/plugins.vim
+++ b/.config/nvim/plugins.vim
@@ -68,3 +68,10 @@ let g:airline#extensions#tabline#buffer_idx_mode = 1
 
 " Org-mode
 let g:org_todo_keywords = ['TODO',  '|', 'DONE', 'CANCELED']
+
+" Floaterm
+let g:floaterm_autoinsert = 1
+let g:floaterm_width = 0.85
+let g:floaterm_height = 0.75
+let g:floaterm_wintitle = 0
+let g:floaterm_autoclose = 1
diff --git a/.config/nvim/settings.vim b/.config/nvim/settings.vim
index c04aeeb..2f09b0f 100644
--- a/.config/nvim/settings.vim
+++ b/.config/nvim/settings.vim
@@ -13,6 +13,7 @@ set shortmess+=c
 set softtabstop=4
 set ruler
 set tabstop=4
+set timeoutlen=0
 set undodir=/tmp
 set undofile
 set wildmode=longest,list,full
diff --git a/.config/nvim/sidebars.vim b/.config/nvim/sidebars.vim
index f21cf8c..4aa6707 100644
--- a/.config/nvim/sidebars.vim
+++ b/.config/nvim/sidebars.vim
@@ -30,7 +30,6 @@ let g:sidebars = {
 			\ }
 			\ }
 
-noremap <silent> <F1> :sp<CR><C-w>j:term<CR>:resize -10<CR>i
 noremap <silent> <F2> :call sidebar#toggle('nerdtree')<CR>
 noremap <F4> :make<space>-j5<space>
 noremap <silent> <F3> :call sidebar#toggle('tagbar')<CR>