dotfiles

commit 56a0f94e190e464a1d4eb969260b842fc506a4f2
parent 3a1645947d0540222b2bf8808667d26b865f023e
Author: Jake Bauer <jbauer@paritybit.ca>
Date:   Fri, 26 Jun 2020 19:36:06 -0400

Merge branch 'master' of https://git.sr.ht/~jbauer/dotfiles

Diffstat:
A
.config/nvim/autoload/spell.vim
 | 
17
+++++++++++++++++
A
.config/nvim/ftplugin/c.vim
 | 
3
+++
A
.config/nvim/ftplugin/cpp.vim
 | 
3
+++
M
.config/nvim/ftplugin/gitcommit.vim
 | 
8
+-------
A
.config/nvim/ftplugin/go.vim
 | 
3
+++
M
.config/nvim/ftplugin/mail.vim
 | 
8
+-------
M
.config/nvim/ftplugin/make.vim
 | 
2
++
A
.config/nvim/ftplugin/markdown.vim
 | 
1
+
A
.config/nvim/ftplugin/tmux.vim
 | 
1
+
M
.config/nvim/init.vim
 | 
25
++++---------------------

10 files changed, 36 insertions(+), 35 deletions(-)
diff --git a/.config/nvim/autoload/spell.vim b/.config/nvim/autoload/spell.vim
@@ -0,0 +1,17 @@
+" Enable Spell Check {{{
+" Thesaurus: gutenberg.org/files/3202/files/mthesaur.txt
+" SpellFile: ftp.vim.org/pub/vim/runtime/spell/en/
+" Colours: http://vim.wikia.com/wiki/Xterm256_color_names_for_console_Vim
+func! SpellCheckToggle()
+	set thesaurus+="~/.vim/thesaurus/mthesaurus.txt"
+	set spellfile="~/.vim/spell/en_CA.diff"
+	set complete+=s
+	setlocal spell! spelllang=en_ca
+	hi clear SpellBad SpellCap SpellRare SpellLocal
+	"        Red      Yellow   Cyan      Magenta
+	hi SpellBad gui=underline,bold guifg=#e27878
+	hi SpellCap gui=underline,bold guifg=#e2a478
+	hi SpellRare gui=bold guifg=#89b8c2
+	hi SpellLocal gui=bold guifg=#a093c7
+endfu
+" }}}
diff --git a/.config/nvim/ftplugin/c.vim b/.config/nvim/ftplugin/c.vim
@@ -0,0 +1,3 @@
+setlocal noexpandtab
+setlocal softtabstop&
+setlocal shiftwidth&
diff --git a/.config/nvim/ftplugin/cpp.vim b/.config/nvim/ftplugin/cpp.vim
@@ -0,0 +1,3 @@
+setlocal noexpandtab
+setlocal softtabstop&
+setlocal shiftwidth&
diff --git a/.config/nvim/ftplugin/gitcommit.vim b/.config/nvim/ftplugin/gitcommit.vim
@@ -1,9 +1,3 @@
 set nofoldenable
 set textwidth=72
-set spellfile="~/.vim/spell/en_CA.diff"
-setlocal spell spelllang=en_ca
-hi clear SpellBad SpellCap SpellRare SpellLocal
-hi SpellBad cterm=underline,bold ctermfg=9
-hi SpellCap cterm=underline,bold ctermfg=172
-hi SpellRare cterm=bold ctermfg=5
-hi SpellLocal cterm=bold ctermfg=12
+call SpellCheckToggle()
diff --git a/.config/nvim/ftplugin/go.vim b/.config/nvim/ftplugin/go.vim
@@ -0,0 +1,3 @@
+setlocal noexpandtab
+setlocal softtabstop&
+setlocal shiftwidth&
diff --git a/.config/nvim/ftplugin/mail.vim b/.config/nvim/ftplugin/mail.vim
@@ -1,9 +1,3 @@
 set nofoldenable
 set textwidth=72
-set spellfile="~/.vim/spell/en_CA.diff"
-setlocal spell spelllang=en_ca
-hi clear SpellBad SpellCap SpellRare SpellLocal
-hi SpellBad cterm=underline,bold ctermfg=9
-hi SpellCap cterm=underline,bold ctermfg=172
-hi SpellRare cterm=bold ctermfg=5
-hi SpellLocal cterm=bold ctermfg=12
+call SpellCheckToggle()
diff --git a/.config/nvim/ftplugin/make.vim b/.config/nvim/ftplugin/make.vim
@@ -1 +1,3 @@
 setlocal noexpandtab
+setlocal softtabstop&
+setlocal shiftwidth&
diff --git a/.config/nvim/ftplugin/markdown.vim b/.config/nvim/ftplugin/markdown.vim
@@ -0,0 +1 @@
+call SpellCheckToggle()
diff --git a/.config/nvim/ftplugin/tmux.vim b/.config/nvim/ftplugin/tmux.vim
@@ -0,0 +1 @@
+setlocal foldmethod=marker
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
@@ -1,4 +1,5 @@
 let mapleader = ","
+source ~/.config/nvim/autoload/spell.vim
 
 "Plugins Used: {{{
 " goyo.vim       — (centers buffer in the terminal / 'distraction-free' mode)
@@ -38,6 +39,7 @@ filetype plugin indent on
 map <leader>s :source ~/.vim/vimrc<CR>
 set history=100
 nnoremap <F9> :make
+noremap <silent> <C-S> :call SpellCheckToggle()<CR>
 
 " Ensure Externally Modified Files Stay Up To Date
 set autoread
@@ -191,27 +193,8 @@ nnoremap <M-7> :b7<CR>
 nnoremap <M-8> :b8<CR>
 nnoremap <M-9> :b9<CR>
 nnoremap <M-0> :b10<CR>
-nnoremap <Up> :resize -2<CR>
-nnoremap <Down> :resize +2<CR>
+nnoremap <Up> :resize +2<CR>
+nnoremap <Down> :resize -2<CR>
 nnoremap <Left> :vertical resize +2<CR>
 nnoremap <Right> :vertical resize -2<CR>
 " }}}
-
-" Enable Spell Check {{{
-" Thesaurus: gutenberg.org/files/3202/files/mthesaur.txt
-" SpellFile: ftp.vim.org/pub/vim/runtime/spell/en/
-" Colours: http://vim.wikia.com/wiki/Xterm256_color_names_for_console_Vim
-func! SpellCheckToggle()
-    set thesaurus+="~/.vim/thesaurus/mthesaurus.txt"
-    set spellfile="~/.vim/spell/en_CA.diff"
-    set complete+=s
-    setlocal spell! spelllang=en_ca
-    hi clear SpellBad SpellCap SpellRare SpellLocal
-    "        Red      Yellow   Cyan      Magenta
-    hi SpellBad gui=underline,bold guifg=#e27878
-    hi SpellCap gui=underline,bold guifg=#e2a478
-    hi SpellRare gui=bold guifg=#89b8c2
-    hi SpellLocal gui=bold guifg=#a093c7
-endfu
-noremap <silent> <C-S> :call SpellCheckToggle()<CR>
-" }}}