updating vim plugins

NERDTreeBookmarks

@@ -3,6 +3,8 @@ dotfiles ~/dotfiles
 Downloads ~/Downloads
 root ~/
 tm ~/Documents/workspace_tm
+obc ~/Documents/workspace_tm/obc
+tix ~/Documents/workspace_tm/amadeus_api
 private ~/Documents/workspace_private
 
 dropbox ~/Dropbox

fish/config.fish

@@ -57,6 +57,8 @@ if status --is-interactive
     abbr --add bxrc 'bundle exec rails c'
     abbr --add bxrs 'bundle exec rails s'
     abbr --add cloud 'cd ~/Library/Mobile\ Documents/com~apple~CloudDocs'
+    abbr --add pg_start 'pg_ctl -D /usr/local/var/postgresql@9.5 start'
+    abbr --add pg_stop 'pg_ctl -D /usr/local/var/postgresql@9.5 stop'
 end
 
 # disable login greeting
@@ -67,4 +69,4 @@ set -g fish_user_paths "/usr/local/sbin" $fish_user_paths
 
 # add kitty support
 # kitty + complete setup fish | source
-# set -g fish_user_paths "/usr/local/opt/postgresql@9.5/bin" $fish_user_paths
+set -g fish_user_paths "/usr/local/opt/postgresql@9.5/bin" $fish_user_paths

fish/fish_variables

@@ -7,6 +7,7 @@ SETUVAR --export LC_ALL:en_US\x2eUTF\x2d8
 SETUVAR __fish_classic_git_prompt_initialized:\x1d
 SETUVAR __fish_init_2_39_8:\x1d
 SETUVAR __fish_init_2_3_0:\x1d
+SETUVAR __fish_init_3_x:\x1d
 SETUVAR _fish_abbr_bb:brew\x20update\x3b\x20and\x20brew\x20outdated
 SETUVAR _fish_abbr_bx:bundle\x20exec
 SETUVAR _fish_abbr_bxrc:bundle\x20exec\x20rails\x20c
@@ -28,6 +29,8 @@ SETUVAR _fish_abbr_gp:git\x20push
 SETUVAR _fish_abbr_gst:git\x20status
 SETUVAR _fish_abbr_gup:git\x20fetch\x20\x26\x26\x20git\x20rebase
 SETUVAR _fish_abbr_obc:cd\x20\x7e/Documents/workspace_tm/obc
+SETUVAR _fish_abbr_pg__start:pg_ctl\x20\x2dD\x20/usr/local/var/postgresql\x409\x2e5\x20start
+SETUVAR _fish_abbr_pg__stop:pg_ctl\x20\x2dD\x20/usr/local/var/postgresql\x409\x2e5\x20stop
 SETUVAR _fish_abbr_tix:cd\x20\x7e/Documents/workspace_tm/amadeus_api/
 SETUVAR _fish_abbr_wtm:cd\x20\x7e/Documents/workspace_tm
 SETUVAR fish_color_autosuggestion:93a1a1
@@ -59,3 +62,4 @@ SETUVAR fish_pager_color_description:B3A06D\x1eyellow
 SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
 SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
 SETUVAR fish_user_abbreviations:\x1d
+SETUVAR fish_user_paths:/usr/local/opt/postgresql\x409\x2e5/bin\x1e/usr/local/sbin\x1e/Users/michi/\x2efzf/bin

fish/functions/fish_user_key_bindings.fish

@@ -0,0 +1,3 @@
+function fish_user_key_bindings
+  fzf_key_bindings
+end

fish/functions/fzf_key_bindings.fish

@@ -0,0 +1 @@
+/Users/michi/.fzf/shell/key-bindings.fish

make_my_dotfiles.sh

@@ -3,7 +3,9 @@
 # some variables
 _fish_shell="/usr/local/bin/fish"
 _homebrew=`which brew`
-_to_install="the_silver_searcher imagemagick postgresql rbenv redis ruby-build tmux unrar yasm youtube-dl elixir git git-flow vim --with-override-system-vi fish emacs node yarn chromedriver"
+_to_install="the_silver_searcher imagemagick postgresql@9.s pgcli rbenv redis ruby-build \
+             tmux unrar yasm youtube-dl elixir git git-flow vim \
+             fish emacs node yarn"
 
 # Generate symlinks for files
 for i in gemrc gitconfig gitignore gvimrc irbrc mongorc.js NERDTreeBookmarks rspec screenrc tmux.conf vimrc rubocop.yml spacemacs

vimrc

@@ -23,7 +23,8 @@ call plug#begin('~/.vim/bundle')
 " Show git status in the gutter
 Plug 'airblade/vim-gitgutter'
 " Fuzzy file finder
-Plug 'ctrlpvim/ctrlp.vim'
+Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
+Plug 'junegunn/fzf.vim'
 " Elixir support
 Plug 'elixir-lang/vim-elixir'
 " Tab support
@@ -40,6 +41,8 @@ Plug 'scrooloose/nerdcommenter'
 Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' }
 " Language packs
 Plug 'sheerun/vim-polyglot'
+" Add comments via gcc or gc
+Plug 'tpope/vim-commentary'
 " Wisely add 'end' in Ruby
 Plug 'tpope/vim-endwise'
 " Git wrapper
@@ -50,6 +53,16 @@ Plug 'vim-airline/vim-airline'
 Plug 'vim-airline/vim-airline-themes'
 " Linter
 " Plug 'w0rp/ale'
+" Solalized Theme
+Plug 'altercation/vim-colors-solarized'
+" Autocompletion
+if has('nvim')
+  Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
+else
+  Plug 'Shougo/deoplete.nvim'
+  Plug 'roxma/nvim-yarp'
+  Plug 'roxma/vim-hug-neovim-rpc'
+endif
 
 " Initialize plugin system
 call plug#end()
@@ -129,6 +142,9 @@ set title
 " No beeping.
 set visualbell
 
+" Set autocompletion on startup
+let g:deoplete#enable_at_startup = 1
+
 " Remove highlights with leader + enter
 nmap <Leader><CR> :nohlsearch<cr>
 
@@ -194,18 +210,6 @@ au BufRead,BufNewFile {Gemfile,Rakefile,Vagrantfile,Thorfile,config.ru,*.rabl} s
 " add json syntax highlighting
 au BufNewFile,BufRead *.json set ft=javascript
 
-" ctrp custom ignores
-let g:ctrlp_custom_ignore = {
-  \ 'dir':  '\.git$\|\.hg$\|\.svn$\|\.eunit$',
-  \ 'file': '\.exe$\|\.so$\|\.dll\|\.beam$\|\.DS_Store$'
-  \ }
-let g:ctrlp_map = '<c-p>'
-
-" Use ag in CtrlP for listing files. Lightning fast and respects .gitignore
-let g:ctrlp_user_command = 'ag %s -l --nocolor -g ""'
-" ag is fast enough that CtrlP doesn't need to cache
-let g:ctrlp_use_caching = 0
-
 " Tab mappings.
 map <leader>tt :tabnew<cr>
 map <leader>te :tabedit<cr>
@@ -237,3 +241,6 @@ map <leader>F :Ack<SPACE>
 
 " bind ag(the_silver_searcher) to ack
 let g:ackprg = 'ag --vimgrep'
+
+" use fuzzy finder
+nnoremap <c-t> :GFiles -co --exclude-standard -- ':!:*.jpeg' ':!:*.jpg' ':!:*.pdf' ':!:*.png' ':!:*.svg' ':!:*.ttf' ':!:.*.woff' ':!:.*.woff2'<CR>

vsc_settings.json

@@ -17,5 +17,6 @@
     "workbench.colorTheme": "One Dark Pro Vivid",
     "extensions.ignoreRecommendations": false,
     "window.zoomLevel": 0,
-    "workbench.iconTheme": null
+    "workbench.iconTheme": null,
+    "explorer.confirmDelete": false
 }

zshrc

@@ -0,0 +1 @@
+[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh