summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nvim/nvim/ftplugin/html.vim2
-rw-r--r--nvim/nvim/ftplugin/markdown.vim4
-rw-r--r--nvim/nvim/init.vim7
3 files changed, 6 insertions, 7 deletions
diff --git a/nvim/nvim/ftplugin/html.vim b/nvim/nvim/ftplugin/html.vim
deleted file mode 100644
index 9659508..0000000
--- a/nvim/nvim/ftplugin/html.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-setlocal tabstop=2 softtabstop=0 expandtab shiftwidth=2
-setlocal autoindent
diff --git a/nvim/nvim/ftplugin/markdown.vim b/nvim/nvim/ftplugin/markdown.vim
index f40bef5..fac588d 100644
--- a/nvim/nvim/ftplugin/markdown.vim
+++ b/nvim/nvim/ftplugin/markdown.vim
@@ -9,7 +9,3 @@ augroup SENTENCES
au!
autocmd InsertCharPre * if &ft=='markdown' | if search('\v(%^|[.!?]\_s+|\_^\-\s|\_^title\:\s|\n\n)%#', 'bcnw') != 0 | let v:char = toupper(v:char) | endif | endif
augroup END
-
-" Tabs to 2 spaces
-setlocal tabstop=2 softtabstop=0 expandtab shiftwidth=2
-setlocal autoindent
diff --git a/nvim/nvim/init.vim b/nvim/nvim/init.vim
index 597c8cf..36886ee 100644
--- a/nvim/nvim/init.vim
+++ b/nvim/nvim/init.vim
@@ -14,12 +14,17 @@ Plugin 'ekaitz-zarraga/droWMark'
" CoffeeScript stuff
Plugin 'kchmck/vim-coffee-script'
-" Paredit for clojure and lisp
+" Paredit for Clojure and Lisp
Plugin 'vim-scripts/paredit.vim'
+" Clojure REPL integration
+Plugin 'tpope/vim-fireplace'
" Syntax highlighting for Rust
Plugin 'wting/rust.vim'
+" Prose in Vim
+Plugin 'junegunn/goyo.vim'
+
" Add plugins here
call vundle#end() " required