nvim: Some consistency cleanup

nvim/.config/nvim/init.vim

@@ -1,7 +1,3 @@
-" Set up leader
-let mapleader="\<SPACE>"
-let maplocalleader=","
-
 lua require 'init'
 
 " This seems to be required here as well as in init.lua else the colorscheme

nvim/.config/nvim/lua/init.lua

@@ -58,6 +58,10 @@ vim.g.loaded_tarPlugin        = 1
 vim.g.loaded_vimballPlugin    = 1
 vim.g.loaded_zipPlugin        = 1
 
+-- Map leader
+vim.g.mapleader = " "
+vim.g.maplocalleader = ","
+
 -- Needs to be set before loading quickr-cscope
 vim.g.quickr_cscope_keymaps   = 0
 -- Needs to be set before vimtex gets loaded, else it complains
@@ -69,12 +73,12 @@ vim.g.vimtex_view_general_options_latexmk = '--unique'
 vim.g.toggle_list_no_mappings = 1
 -- Enable rainbow brackets everywhere
 vim.g.rainbow_active = 1
+
+-- Settings using nvim.api
 -- Needs to be set before vim-sneak is loaded
 vim.api.nvim_command('let g:sneak#label = 1')
 vim.api.nvim_command('let g:sneak#s_next = 1')
 vim.api.nvim_command('let g:sneak#use_ic_scs = 0')
-
--- Settings using nvim.api
 -- We do this to prevent the loading of the system fzf.vim plugin. This is
 -- present at least on Arch/Manjaro
 vim.api.nvim_command('set rtp-=/usr/share/vim/vimfiles')
@@ -90,11 +94,10 @@ vim.api.nvim_command('set pumblend=30')
 vim.api.nvim_command('set sessionoptions-=blank')
 vim.api.nvim_command('set backspace=indent,eol,start')
 vim.api.nvim_command('set diffopt=filler,internal,algorithm:histogram,indent-heuristic')
-
+-- Load out custom colorscheme
+vim.api.nvim_command('colorscheme yolokai')
 -- Add the in built Cfilter plugin. Replaces QFGrep.
-vim.cmd [[packadd cfilter]]
-
-vim.cmd [[colorscheme yolokai]]
+vim.api.nvim_command('packadd cfilter')
 
 -- Add other lua configs or plugins
 require 'autocmd'