From 77b615b1d13506310b308718515fc104ec43ffc3 Mon Sep 17 00:00:00 2001
From: Joe Groocock <frebib@gmail.com>
Date: Wed, 12 Oct 2016 14:46:25 +0100
Subject: [PATCH] Add JavaScript and OCaml specific Vim config

---
 .gitignore                          | 1 +
 .vim/ftplugin/javascript/config.vim | 1 +
 .vim/ftplugin/ocaml/config.vim      | 1 +
 .vim/ftplugin/ocaml/keybinds.vim    | 3 +++
 .vimrc                              | 5 +++--
 5 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 .vim/ftplugin/javascript/config.vim
 create mode 100644 .vim/ftplugin/ocaml/config.vim
 create mode 100644 .vim/ftplugin/ocaml/keybinds.vim

diff --git a/.gitignore b/.gitignore
index b367175..5bd5c1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ bookmarks
 
 *.log
 .xournal/recent-files
+.vim/bundle
diff --git a/.vim/ftplugin/javascript/config.vim b/.vim/ftplugin/javascript/config.vim
new file mode 100644
index 0000000..a421697
--- /dev/null
+++ b/.vim/ftplugin/javascript/config.vim
@@ -0,0 +1 @@
+set tabstop=2
diff --git a/.vim/ftplugin/ocaml/config.vim b/.vim/ftplugin/ocaml/config.vim
new file mode 100644
index 0000000..a421697
--- /dev/null
+++ b/.vim/ftplugin/ocaml/config.vim
@@ -0,0 +1 @@
+set tabstop=2
diff --git a/.vim/ftplugin/ocaml/keybinds.vim b/.vim/ftplugin/ocaml/keybinds.vim
new file mode 100644
index 0000000..b8d017e
--- /dev/null
+++ b/.vim/ftplugin/ocaml/keybinds.vim
@@ -0,0 +1,3 @@
+map <c-p> <esc>:MerlinDocument<enter>
+map <c-b> <esc>:MerlinLocate<enter>
+map <c-.> <esc>:MerlinTypeOf<enter>
diff --git a/.vimrc b/.vimrc
index 349452d..2649320 100644
--- a/.vimrc
+++ b/.vimrc
@@ -2,8 +2,8 @@ set nocompatible              " be iMproved, required
 
 syntax enable
 set tabstop=4
-set shiftwidth=4
-set softtabstop=4
+set shiftwidth=0
+set softtabstop=-1
 set expandtab
 set number
 set autoindent
@@ -11,6 +11,7 @@ set laststatus=2
 set mouse=a
 set encoding=utf-8
 set background=dark
+set directory=$HOME/.vim/swapfiles//
 
 " GVim settings
 set guifont=Sauce\ Code\ Pro\ 10.5