summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--Makefile3
-rwxr-xr-xbashrc2
-rw-r--r--vimrc54
3 files changed, 57 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 6f49096..2c540bf 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,8 @@ INSTALL = \
 	emacs.d \
 	gitconfig \
 	gitignore \
-	tmux.conf
+	tmux.conf \
+	vimrc
 
 
 INSTALLED = $(patsubst %,$(INTO)/.%,$(INSTALL))
diff --git a/bashrc b/bashrc
index a8170f8..92ed046 100755
--- a/bashrc
+++ b/bashrc
@@ -1,4 +1,4 @@
-export EDITOR="emacsclient -a ''"
+export EDITOR="vim"
 export HISTFILE=
 export LANG="en_US.UTF-8"
 export LC_ALL="$LANG"
diff --git a/vimrc b/vimrc
new file mode 100644
index 0000000..322cc61
--- /dev/null
+++ b/vimrc
@@ -0,0 +1,54 @@
+set encoding=utf-8
+setlocal spell spelllang=en_us
+set nospell
+
+set expandtab     " spaces over tabs for indentation
+set tabstop=2     " 2 spaces char for tabs
+set softtabstop=2 " 2 space for tabs
+set shiftwidth=2  " shift equally to indentation
+set autoindent    " always indent
+
+set viminfo=""
+
+set hlsearch              " highlight search
+set incsearch             " incrementally move to match and highlight
+set ignorecase smartcase  " case insensitive search if there are no capital letters
+
+set autochdir  " change current directory to file in viewed buffer's
+set autoread   " automatically re-read unmodified buffer on file change
+
+set laststatus=2
+let &statusline  = '[%n] %<%F %m%r%w%y%='
+let &statusline .= ' (%l,%c) %P of %L'
+
+set hidden       " don't close but hide the buffer when dismissed
+set shortmess=a  " a=all, use all abbrv possible in messages
+set showcmd      " show last command
+
+set wildmenu wildmode=list:longest
+set list listchars=tab:»‧,trail:░,precedes:◄,extends:►,nbsp:‧
+
+" Enable file type detection with loading plugins & indent by file type.
+filetype plugin indent on
+
+if has('autocmd')
+  augroup filetype
+    autocmd!
+    " Indentation
+    autocmd FileType gitcommit setlocal spell
+    autocmd FileType gitconfig setlocal nolist noet sts=0 sw=0
+    autocmd FileType go setlocal nolist noet sts=0 sw=0
+    autocmd FileType make setlocal nolist noet ts=4 sts=0 sw=0
+    autocmd FileType python setlocal sts=2 sw=2
+    autocmd FileType vim setlocal keywordprg=:help
+    " Maps
+    autocmd FileType help nnoremap <silent><buffer> q :q<CR>
+  augroup END
+
+  " Do not show trailing space markers in insert mode.
+  augroup listchars
+    autocmd!
+    autocmd InsertEnter * if &list | set listchars-=trail:░ | endif
+    autocmd InsertLeave * if &list | set listchars+=trail:░ | endif
+  augroup END
+endif