summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ftplugin/java.vim5
-rw-r--r--init.vim16
2 files changed, 20 insertions, 1 deletions
diff --git a/ftplugin/java.vim b/ftplugin/java.vim
new file mode 100644
index 0000000..1d29aa3
--- /dev/null
+++ b/ftplugin/java.vim
@@ -0,0 +1,5 @@
+if &colorcolumn != ""
+ set colorcolumn=101
+endif
+
+set textwidth=100
diff --git a/init.vim b/init.vim
index e29162f..c5312e7 100644
--- a/init.vim
+++ b/init.vim
@@ -36,7 +36,9 @@ Plug 'nvim-tree/nvim-tree.lua'
Plug 'vim-airline/vim-airline'
Plug 'git://git.josher.dev/fieldmarshal.vim.git'
-Plug 'git://git.josher.dev/rneovim-userregs.git'
+if has('rneovim')
+ Plug 'git://git.josher.dev/rneovim-userregs.git'
+endif
Plug 'git@git.josher.dev:config.vim.git', { 'dir': g:plug_home . '/config.vim' }
call plug#end()
@@ -87,6 +89,18 @@ endif
map <leader>nt <cmd>NvimTreeToggle<cr>
noremap <leader>nE :<C-u>e <C-r>=expand('%:h')<cr>/
+if has('rneovim')
+ hi ColorColumn guifg=#3a3a3a guibg=none gui=None
+ " This is my patched version of neovim.
+ set fillchars+=colorcol:│
+ augroup InitVim
+ au ColorScheme * hi ColorColumn guifg=#3a3a3a guibg=none gui=None
+ augroup END
+endif
+
+set colorcolumn=81
+set textwidth=80
+
" Opens a terminal in the directory of the current file.
command! TERM exec "term sh -c 'cd " . expand('%:p:h') . " && exec $SHELL'"