From 22ec8fb577d5ba070ed2045c4781da48946681a9 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Wed, 9 Aug 2017 15:43:07 +0200
Subject: [PATCH] Update editor topics

---
 editor/+emacs/install   |  3 +-
 editor/+neovim/install  |  7 ++--
 editor/+vimlite/.vimrc  | 77 -----------------------------------------
 editor/+vimlite/install |  1 +
 4 files changed, 5 insertions(+), 83 deletions(-)
 delete mode 100644 editor/+vimlite/.vimrc

diff --git a/editor/+emacs/install b/editor/+emacs/install
index b82164a6..5805186a 100755
--- a/editor/+emacs/install
+++ b/editor/+emacs/install
@@ -14,5 +14,6 @@ case $OSTYPE in
 esac
 
 if [[ ! -d "$HOME/.emacs.d" ]]; then
-    git clone --recursive "https://github.com/hlissner/.emacs.d" "$HOME/.emacs.d"
+    git clone --recursive "https://github.com/hlissner/.emacs.d" ~/.emacs.d
+    cd ~/.emacs.d && YES=1 make install
 fi
diff --git a/editor/+neovim/install b/editor/+neovim/install
index 65788e72..c9c59131 100755
--- a/editor/+neovim/install
+++ b/editor/+neovim/install
@@ -2,7 +2,7 @@
 
 case $OSTYPE in
     darwin*)
-        command -v nvim >/dev/null || brew install --HEAD neovim/neovim/neovim
+        command -v nvim >/dev/null || brew install neovim
         ;;
     linux*)
         if [[ -f /etc/arch-release ]]; then
@@ -15,9 +15,6 @@ esac
 
 if [[ ! -d "$HOME/.vim" ]]; then
     git clone --recursive "https://github.com/hlissner/.vim" "$HOME/.vim"
-fi
-
-if [[ -f "$HOME/.vim/Makefile" ]]; then
-    cd "$HOME/.vim" && make install && make neovim
+    cd "$HOME/.vim" && make install
 fi
 
diff --git a/editor/+vimlite/.vimrc b/editor/+vimlite/.vimrc
deleted file mode 100644
index 9188747c..00000000
--- a/editor/+vimlite/.vimrc
+++ /dev/null
@@ -1,77 +0,0 @@
-set nocompatible
-
-" Preferences {{{
-    syntax on
-    filetype indent plugin on
-
-    set laststatus=2             " Show statusbar
-    set nolist                   " Don't show whitespace chars (indentLine does it nicer)
-    set nospell                  " No spell check, please
-    set number                   " Line numbers
-    set visualbell               " No sounds!
-    set showmatch                " Show matching delimiters
-    set browsedir=buffer         " Sets File>Open to start in current file's path
-    set showmode                 " Show mode in cmdline
-    set autoread                 " Auto-update a file that's been edited externally
-    set backspace=indent,eol,start
-    set mouse=a
-    set lazyredraw               " Don't update screen while running macros
-    set hidden                   " Hide abandoned buffers
-    set nostartofline
-    set scrolloff=5
-    set shortmess+=filmnrxoOtTs
-
-    set ruler                " Show line/col no in statusline
-    set showcmd              " Show command issued
-
-    set textwidth=88
-    set fillchars=vert:¦
-
-    set tags=./.tags;/,~/.tags,~/tags
-
-    set completeopt=longest,menu,preview
-    set wildmenu                    " Show menu instead of auto-complete
-    set wildmode=list:longest,full  " command <Tab> completion: list
-                                    " matches -> longest common -> then
-                                    " all.
-    set wildignore+=*.cache,cache/**,*~,*.swp,*.log,.sass-cache
-    set wildignore+=*.class,*.o,*.pyc,*.obj,*DS_Store*
-
-    " Shell {{{
-        " 256bit terminals
-        set t_Co=256
-        set title
-    " }}}
-    " Search {{{
-        set incsearch            " find as you type
-        set hlsearch             " Highlight search terms
-        set ignorecase           " case insensitive search
-        set smartcase            " case sensitive when uc present
-        set gdefault             " global flag for substitute by default
-    " }}}
-    " Formatting {{{
-        set autoindent
-        set shiftround
-        set expandtab
-        set shiftwidth=4
-        set tabstop=4
-        set softtabstop=4
-        " Wrapping
-        set nowrap
-        " Backspace and cursor keys to wrap
-        set whichwrap=b,s,h,l,<,>,[,]
-        set backspace=indent,eol,start      " normal backspace behavior
-        " see :h fo-table
-        set formatoptions=qrn1lr
-    " }}}
-    " Keymaps {{{
-        let mapleader = ","
-    " }}}
-    " Navigation {{{
-        " netrw
-        let g:netrw_banner = 0
-        let g:netrw_keepdir = 0
-        let g:netrw_liststyle = 3
-        let g:netrw_sort_options = 'i'
-    " }}}
-" }}}
diff --git a/editor/+vimlite/install b/editor/+vimlite/install
index 35765d71..65d675d6 100755
--- a/editor/+vimlite/install
+++ b/editor/+vimlite/install
@@ -13,3 +13,4 @@ case $OSTYPE in
         ;;
 esac
 
+[[ -f ~/.vimrc ]] || wget -O ~/.vimrc https://raw.githubusercontent.com/hlissner/.vim/master/vimrc.mini