From c4fcbe6ec016552f04e5f1f09b3a51952d5774fa Mon Sep 17 00:00:00 2001
From: Bert Peters <bert@bertptrs.nl>
Date: Tue, 7 Jan 2020 16:28:46 +0100
Subject: [PATCH] Reorganize filetype plugins.

---
 .gitmodules                                 | 2 +-
 vim/.vim/after/ftplugin/cpp.vim             | 4 ++++
 vim/.vim/after/ftplugin/haskell.vim         | 1 +
 vim/.vim/after/ftplugin/python.vim          | 1 +
 vim/.vim/after/ftplugin/yaml.vim            | 2 ++
 vim/.vim/pack/bundle/{start => opt}/molokai | 0
 vim/.vim/vimrc                              | 6 +-----
 7 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 vim/.vim/after/ftplugin/cpp.vim
 create mode 100644 vim/.vim/after/ftplugin/haskell.vim
 create mode 100644 vim/.vim/after/ftplugin/python.vim
 create mode 100644 vim/.vim/after/ftplugin/yaml.vim
 rename vim/.vim/pack/bundle/{start => opt}/molokai (100%)

diff --git a/.gitmodules b/.gitmodules
index cc2bd82..0616450 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,5 +1,5 @@
 [submodule "vim/bundle/molokai"]
-	path = vim/.vim/pack/bundle/start/molokai
+	path = vim/.vim/pack/bundle/opt/molokai
 	url = https://github.com/tomasr/molokai
 [submodule "vim/bundle/vim-less"]
 	path = vim/.vim/pack/bundle/start/vim-less
diff --git a/vim/.vim/after/ftplugin/cpp.vim b/vim/.vim/after/ftplugin/cpp.vim
new file mode 100644
index 0000000..37390e5
--- /dev/null
+++ b/vim/.vim/after/ftplugin/cpp.vim
@@ -0,0 +1,4 @@
+setlocal expandtab
+
+" intelligent comments
+setlocal comments=sl:/*,mb:\ *,elx:\ */
diff --git a/vim/.vim/after/ftplugin/haskell.vim b/vim/.vim/after/ftplugin/haskell.vim
new file mode 100644
index 0000000..5245bdc
--- /dev/null
+++ b/vim/.vim/after/ftplugin/haskell.vim
@@ -0,0 +1 @@
+setlocal expandtab
diff --git a/vim/.vim/after/ftplugin/python.vim b/vim/.vim/after/ftplugin/python.vim
new file mode 100644
index 0000000..5245bdc
--- /dev/null
+++ b/vim/.vim/after/ftplugin/python.vim
@@ -0,0 +1 @@
+setlocal expandtab
diff --git a/vim/.vim/after/ftplugin/yaml.vim b/vim/.vim/after/ftplugin/yaml.vim
new file mode 100644
index 0000000..522978d
--- /dev/null
+++ b/vim/.vim/after/ftplugin/yaml.vim
@@ -0,0 +1,2 @@
+setlocal expandtab
+setlocal tabstop=2 shiftwidth=2 softtabstop=2
diff --git a/vim/.vim/pack/bundle/start/molokai b/vim/.vim/pack/bundle/opt/molokai
similarity index 100%
rename from vim/.vim/pack/bundle/start/molokai
rename to vim/.vim/pack/bundle/opt/molokai
diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc
index 2a730be..4157c91 100644
--- a/vim/.vim/vimrc
+++ b/vim/.vim/vimrc
@@ -33,7 +33,7 @@ map <F7> :call SetExecutable()<CR>
 imap <F7> <Esc>:call SetExecutable<CR>
 
 " Paste using Ctrl+V in insert mode.
-inoremap <C-v> <C-o>"+P<C-o>=']
+inoremap <C-v> <C-o>"+p
 
 "language specific syntastic configurtion
 "syntastic configuration
@@ -45,10 +45,6 @@ let g:syntastic_always_populate_loc_list = 1
 let g:syntastic_auto_loc_list = 1
 let g:syntastic_check_on_wq = 0
 
-autocmd Filetype python setlocal expandtab
-autocmd Filetype markdown setlocal textwidth=72 expandtab
-autocmd Filetype haskell setlocal expandtab
-
 " Remove trailing whitespace, always.
 fun! StripTrailingWhitespace()
 	" Skip files where the type is trailing space sensitive.