diff --git a/home/-shrc b/home/-shrc
index b32ab6c..1c18e5a 100644
--- a/home/-shrc
+++ b/home/-shrc
@@ -59,7 +59,7 @@ export MAKEFLAGS="-j2"
 export VST_SDK_DIR="$HOME/src/vstsdk2.4"
 export LADSPA_PATH="/usr/lib/ladspa"
 
-export EDITOR='vim -p'
+export EDITOR='vim'
 
 # colors
 for x in ls dir vdir grep fgrep egrep; do
diff --git a/home/vimrc b/home/vimrc
index d95c191..b0aee9e 100644
--- a/home/vimrc
+++ b/home/vimrc
@@ -87,7 +87,6 @@ set showcmd                           " show number of lines/etc. selected
 set lazyredraw                        " when executing macros, untyped things
 set shortmess=atI                     " be less verbose and shut up vim
 set suffixes=.bak,~,.swp,.o,.log,.out " lower tab-completion priority
-set showtabline=2                     " always show tab bar
 set noerrorbells visualbell t_vb=     " disable bells
 set scrolloff=3                       " row context during scrolling
 set sidescrolloff=2                   " col context during scrolling
@@ -363,7 +362,7 @@ if has('gui_running')
 else
 "if exists('g:airline_symbols')
     set laststatus=2
-    let g:airline#extensions#tabline#enabled = 1
+    let g:airline#extensions#tabline#enabled = 0
 endif
 
 let g:airline_mode_map = {