dotfiles

commit 9804ba98a8b4c8d8fa69839fb37f106bf5fe78b1
parent 22e9e0a491008a7acfc4c715926c29ce68b712b4
Author: Daniel Moch <daniel@danielmoch.com>
Date:   Sat, 29 Dec 2018 09:34:38 -0500

Vim config updates

Diffstat:
M
.vim/after/ftplugin/java.vim
 | 
1
+
M
.vim/after/ftplugin/python.vim
 | 
4
+++-
A
.vim/after/ftplugin/rust.vim
 | 
8
++++++++
M
.vim/after/ftplugin/vim.vim
 | 
3
+++
M
.vim/vimrc
 | 
9
+++------

5 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/.vim/after/ftplugin/java.vim b/.vim/after/ftplugin/java.vim
@@ -8,6 +8,7 @@ setlocal sts=2 sw=2
 setlocal tw=120
 
 compiler javac
+set makeprg=javac\ %
 
 execute InitializeClasspath() | execute BuildJavaMakeprg()
 
diff --git a/.vim/after/ftplugin/python.vim b/.vim/after/ftplugin/python.vim
@@ -6,5 +6,7 @@ compiler pylint
 
 " Check if Pipenv is available, and adjust makeprg if it is
 if(filereadable('Pipfile'))
-    let &makeprg= 'pipenv run '.&makeprg
+    let &makeprg= 'pipenv run '.&makeprg.' %'
+else
+    let &makeprg= &makeprg.' %'
 endif
diff --git a/.vim/after/ftplugin/rust.vim b/.vim/after/ftplugin/rust.vim
@@ -0,0 +1,8 @@
+" Break on non-comment lines (t) and insert a comment character (r)
+setlocal formatoptions+=tr
+
+" Always set the compiler
+compiler rustc
+
+" Customize compiler if we're working on a crate
+set makeprg=cargo\ clippy
diff --git a/.vim/after/ftplugin/vim.vim b/.vim/after/ftplugin/vim.vim
@@ -1,2 +1,5 @@
 " Break non-comment lines too
 setlocal fo+=t
+
+" Opinionated use of tabs over spaces
+setlocal softtabstop=4 shiftwidth=4 expandtab
diff --git a/.vim/vimrc b/.vim/vimrc
@@ -369,9 +369,9 @@ nnoremap <F5> :nohl<CR>
 nnoremap <F6> :call MySkeleton()<CR>
 nnoremap <F8> :Goyo<CR>
 if has('win32') || has('win64')
-    nnoremap <F9> :MakeJob! %:S<CR>
+    nnoremap <F9> :MakeJob!<CR>
 else
-    nnoremap <F9> :MakeJob! %<CR>
+    nnoremap <F9> :MakeJob!<CR>
 endif
 " }}}
 
@@ -385,10 +385,7 @@ set ttyfast
 set nowrap
 set noshowmode
 set showcmd
-set expandtab
-set textwidth=72
-set softtabstop=4
-set shiftwidth=4
+set textwidth=80
 set autoindent
 set visualbell
 set smartcase