commit cbe53ef7043241d36162e5559f4af0abd4529958
parent 1307a2f71f2bd7eee6c3db4b55f70da24116e0f9
Author: gearsix <gearsix@tuta.io>
Date:   Thu, 22 Oct 2020 18:38:44 +0100
Merge branch 'master' of https://notabug.org/gearsix/g6dotfiles into master
Diffstat:
| M | src/nvimrc | | | 38 | +++++++++++++++++++------------------- | 
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/nvimrc b/src/nvimrc
@@ -14,10 +14,10 @@
 
 "0. VIM-PLUG
     call plug#begin('~/.local/share/nvim/plugged')
-"        Plug 'airodactyl/neovim-ranger' "use ranger for file explorer
+	"Plug 'airodactyl/neovim-ranger' "use ranger for file explorer
         Plug 'vim-utils/vim-man'
         Plug 'w0rp/ale'
-		Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }
+	Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }
     call plug#end()
 
 "0-1. VIM-PLUG SETTINGS
@@ -25,8 +25,8 @@
 	let g:ale_fixers = {'javascript': ['standard']}
 
 "1. GENERAL
-	set history=500			"how many lines of history to remember
-	set autoread			"read a file if it's changed from the outside
+	set history=500		"how many lines of history to remember
+	set autoread		"read a file if it's changed from the outside
 	set ffs=unix,dos,mac	"filetype priority
 
 "2. COLOURS
@@ -37,25 +37,25 @@
 	set tabstop=4		"number of visual spaces per tab
 	set softtabstop=4	"number of spaces in a tab when editing
 	set shiftwidth=4	"number of spaces when shifting a visual block
-	set hid				"hide ignored buffers
+	set hid			"hide ignored buffers
 	"set expandtab		"tabs to spaces
 
 "4. UI
-	set number			"show numbers on in the margin
-	set showcmd			"show cmdline in the bottom bar
+	set number		"show numbers on in the margin
+	set showcmd		"show cmdline in the bottom bar
 	set cmdheight=2		"height of cmdline
 	set cursorline		"highlight current line
 	set wildmenu		"visual autocomplete for cmd menu
 	set showmatch		"highlight matching [{()}]
-	set nowrap			"turn off line wrapping
+	set nowrap		"turn off line wrapping
 	set laststatus=2	"always show the last status line
 	"set statusline=\ %F%m%r%h\ %w\ \ \ \ \ \ \ \ \ \ \ \ Line:\ %l
-  set scrolloff=1     "always show at least one line above/below the cursor
-  " highlight text over colwidth
-  augroup vimrc_autocmds
-    autocmd BufEnter * highlight OverLength ctermbg=grey guibg=#592929
-    autocmd BufEnter * match OverLength /\%80v.*/
-  augroup END
+	set scrolloff=1     "always show at least one line above/below the cursor
+	" highlight text over colwidth
+		augroup vimrc_autocmds
+		autocmd BufEnter * highlight OverLength ctermbg=grey guibg=#592929
+		autocmd BufEnter * match OverLength /\%80v.*/
+	augroup END
 
 "5. SEARCH
 	set incsearch		"search as characters are entered
@@ -63,11 +63,11 @@
 
 "6. FOLDING
 	set foldmethod=indent	  "fold based on syntax
-	set foldenable			  "enable folding
-	set foldnestmax=6		  "avoids massively nested folds
+	set foldenable		  "enable folding
+	set foldnestmax=6	  "avoids massively nested folds
 
 "7. TEXT WRAPPING
-	set wrap		"enable text wrapping
+	set wrap	"enable text wrapping
 	set linebreak	"only insert linebreaks when Enter key is pressed
 
 "8. SHORTCUTS
@@ -79,8 +79,8 @@
 	command W w !sudo tee % > /dev/null
 	"<Esc> to exit terminal mode
 	:tnoremap <Esc> <C-\><C-n>
-  "vertical res
-  cnoreabbrev vres vertical res
+	"vertical res
+	cnoreabbrev vres vertical res
 
 "8. PLUGINS
 set rtp+=/home/alex/go/src/golang.org/x/lint/misc/vim