cleanup: [nvim] statusline config + update buffer mappings

.config/nvim/init.vim

@@ -106,20 +106,6 @@ set termguicolors
 " Colorscheme
 colorscheme polyjuice
 
-" Statusline
-set noshowmode
-source $XDG_CONFIG_HOME/nvim/statusline.vim
-
-augroup statusline
-    autocmd!
-	autocmd VimEnter *
-		\ call UpdateInactiveWindows()
-    autocmd VimEnter,WinEnter,BufWinEnter *
-		\ call RefreshStatusLine('active')
-	autocmd WinLeave *
-		\ call RefreshStatusLine('inactive')
-augroup END
-
 "" Text, tab and indent
 """"""""""""""""""""""""""""""""""""""""""""""""""
 " Do not use spaces instead of tabs
@@ -153,6 +139,19 @@ autocmd BufWritePre * %s/\s\+$//e
 """""""""""""""""""""""""""""""""""""""""""""""""""
 "Always show the status line
 set laststatus=2
+set noshowmode
+
+source $XDG_CONFIG_HOME/nvim/statusline.vim
+
+augroup statusline
+	autocmd!
+	autocmd VimEnter *
+		\ call UpdateInactiveWindows()
+	autocmd VimEnter,WinEnter,BufWinEnter *
+		\ call RefreshStatusLine('active')
+	autocmd WinLeave *
+		\ call RefreshStatusLine('inactive')
+augroup END
 
 "" Macros
 """"""""""""""""""""""""""""""""""""""""""""""""""
@@ -160,8 +159,8 @@ set laststatus=2
 noremap <leader>s :source ~/.config/nvim/init.vim <CR>
 
 " Circle through buffers
-noremap <leader>n :bn
+noremap <leader>n :bn<CR>
-noremap <leader>p :bp
+noremap <leader>p :bp<CR>
 
 " Clear the search highlight
 noremap <leader>q :nohl<CR>

.config/nvim/statusline.vim

@@ -1,14 +1,14 @@
 function! CurrentMode()
 	let g:currentmode={
-		   \ 'n'  : '[ NORMAL ]',
+		\ 'n'	: '[ NORMAL ]',
-		   \ 'v'  : '[ VISUAL ]',
+		\ 'v'	: '[ VISUAL ]',
-		   \ 'V'  : '[ V·LINE ]',
+		\ 'V'	: '[ V·LINE ]',
-		   \ '' : '[ V·BLOCK ]',
+		\ ''	: '[ V·BLOCK ]',
-		   \ 'i'  : '[ INSERT ]',
+		\ 'i'	: '[ INSERT ]',
-		   \ 'R'  : '[ REPLACE ]',
+		\ 'R'	: '[ REPLACE ]',
-		   \ 'Rv' : '[ V·REPLACE ]',
+		\ 'Rv'	: '[ V·REPLACE ]',
-		   \ 'c'  : '[ COMMAND ]',
+		\ 'c'	: '[ COMMAND ]',
-		   \}
+		\}
 
 	return g:currentmode[mode()]
 endfunction
@@ -16,15 +16,15 @@ endfunction
 function! ModeColor()
 
 	let g:modecolor={
-		   \ 'n'  : '%#NormalMode#',
+		\ 'n'	: '%#NormalMode#',
-		   \ 'v'  : '%#VisualMode#',
+		\ 'v'	: '%#VisualMode#',
-		   \ 'V'  : '%#VisualMode#',
+		\ 'V'	: '%#VisualMode#',
-		   \ '' : '%#VisualMode#',
+		\ ''	: '%#VisualMode#',
-		   \ 'i'  : '%#InsertMode#',
+		\ 'i'	: '%#InsertMode#',
-		   \ 'R'  : '%#ReplaceMode#',
+		\ 'R'	: '%#ReplaceMode#',
-		   \ 'Rv' : '%#ReplaceMode#',
+		\ 'Rv'	: '%#ReplaceMode#',
-		   \ 'c'  : '%#CommandMode#',
+		\ 'c'	: '%#CommandMode#',
-		   \}
+		\}
 
 	return g:modecolor[mode()]
 endfunction