Faffed around with stuff

.config/oni/config.js

@@ -27,6 +27,7 @@ exports.configuration = {
     "language.vue.languageServer.command":"vls",
     "experimental.indentLines.enabled": true,
     "oni.useDefaultConfig": true,
+    "tab.mode" : "tabs",
     "oni.bookmarks": ["~/Documents"],
     "editor.textMateHighlighting.enabled" : true,
     "editor.fontSize": "15px",

.vimrc

@@ -14,22 +14,28 @@ Plugin 'gmarik/vundle'
 " Keep bundle commands between here and filetype plugin indent on.
 " scripts on GitHub repos
 if exists('g:gui_oni')
-    set noshowmode
-    set noruler
-    set laststatus=0
-    set noshowcmd
+  set noshowmode
+  set noruler
+  set laststatus=0
+  set noshowcmd
 else 
-    " Statements here
-    Plugin 'Valloric/YouCompleteMe' "This is just the client. Install server
-                                    "with ./<plugin location>/install.sh
-                                    " --clang-completer
-                                    "
-    Plugin 'jistr/vim-nerdtree-tabs'
-    "Configure ctrlp
-    set runtimepath^=~/.vim/bundle/ctrlp.vim
-    Plugin 'vim-airline/vim-airline'
-    Plugin 'vim-airline/vim-airline-themes'
-    Plugin 'ctrlpvim/ctrlp.vim'
+  " Statements here
+  Plugin 'Valloric/YouCompleteMe' "This is just the client. Install server
+                                  "with ./<plugin location>/install.sh
+                                  " --clang-completer
+                                  "
+  Plugin 'jistr/vim-nerdtree-tabs'
+  set runtimepath^=~/.vim/bundle/ctrlp.vim
+
+  Plugin 'vim-airline/vim-airline'
+  Plugin 'vim-airline/vim-airline-themes'
+  Plugin 'ctrlpvim/ctrlp.vim'
+
+  "" Ignore some folders and files for CtrlP indexing
+  let g:ctrlp_custom_ignore = {
+  \ 'dir':  '\.git$\|\.yardoc\|node_modules\|vendor\|log\|tmp$',
+  \ 'file': '\.so$\|\.dat$|\.DS_Store$'
+  \ }
 endif
 
 Plugin 'ap/vim-css-color'
@@ -39,6 +45,7 @@ Plugin 'tpope/vim-rails'
 Plugin 'altercation/vim-colors-solarized'
 Plugin 'scrooloose/nerdtree'
 Plugin 'airblade/vim-gitgutter'
+Plugin 'tpope/vim-surround'
 "Plugin 'scrooloose/syntastic'
 Plugin 'vim-ruby/vim-ruby'
 Plugin 'peterhoeg/vim-qml'
@@ -93,9 +100,9 @@ if _curfile =~ "Makefile" || _curfile =~ "makefile" || _curfile =~ ".*\.mk"
     set noexpandtab
 else
     set expandtab
-    set tabstop=4
-    set shiftwidth=4
-    set softtabstop=4
+    set tabstop=2
+    set shiftwidth=2
+    set softtabstop=2
 endif
 
 "===================== Reselect visual block after indent/outdent ===========

.zshrc

@@ -114,6 +114,8 @@ export PATH="$HOME/.local/kitty.app/bin:$PATH"
 
 bindkey "^P" up-line-or-search
 setopt NO_NOMATCH
+bindkey -v  # instead of set -o vi
+bindkey -e jk \\e
 
 export PATH=$HOME/Android/Sdk/tools/bin:$PATH
 export PATH=$HOME/android-studio/bin:$PATH