From 741c2aa70c7b1fe8999abc3654fa9edb09849342 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Sat, 10 Aug 2013 14:46:05 -0400
Subject: [PATCH] feat(coreos-base/coreos-base): Add default vimrc so vim acts
 like vim.

Because, I mean, really.
---
 ...e-0-r64.ebuild => coreos-base-0-r65.ebuild} |  0
 .../coreos-base/coreos-base-0.ebuild           |  4 ++++
 .../coreos-base/coreos-base/files/vimrc        | 18 ++++++++++++++++++
 3 files changed, 22 insertions(+)
 rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/{coreos-base-0-r64.ebuild => coreos-base-0-r65.ebuild} (100%)
 create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/vimrc

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r64.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r65.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r64.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r65.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0.ebuild
index 9d3660a2bf..f3b886d870 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0.ebuild
@@ -128,6 +128,10 @@ src_install() {
 		# Insert glibc's nsswitch.conf since that is installed weirdly
 		doins "${FILESDIR}"/nsswitch.conf
 
+		# Insert a mini vimrc to avoid driving everyone insane
+		insinto /etc/vim
+		doins "${FILESDIR}"/vimrc
+
 		# Symlink /etc/localtime to something on the stateful partition, which we
 		# can then change around at runtime.
 		dosym /var/lib/timezone/localtime /etc/localtime || die
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/vimrc b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/vimrc
new file mode 100644
index 0000000000..dd436fcb36
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/vimrc
@@ -0,0 +1,18 @@
+" Minimal configuration file for Vim on CoreOS
+"
+" The vim package is installed with USE=minimal to avoid installing lots of
+" extra files but that doesn't mean we like vim acting as if it were vi.
+
+" General settings from Gentoo's default vimrc:
+set nocompatible        " Use Vim defaults (much better!)
+set bs=2                " Allow backspacing over everything in insert mode
+set ruler               " Show the cursor position all the time
+set nomodeline          " We don't allow modelines by default
+
+" Read vimrc from the state partition if it exists.
+if filereadable("/media/state/etc/vim/vimrc")
+  source /etc/vim/vimrc
+endif
+if filereadable("/media/state/etc/vim/vimrc.local")
+  source /etc/vim/vimrc.local
+endif