Skip to content

Commit

Permalink
Adds new things
Browse files Browse the repository at this point in the history
  • Loading branch information
tyrbo committed Nov 29, 2016
1 parent 4ba2afb commit 0139779
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
1 change: 1 addition & 0 deletions gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
name = Jonmichael Chambers
[core]
editor = nvim
excludesfile = ~/.gitignore
[push]
default = simple
2 changes: 2 additions & 0 deletions gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.tern-port
.node-version
1 change: 1 addition & 0 deletions install.conf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
- link:
~/.hyper.js: hyper.js
~/.gitconfig: gitconfig
~/.gitignore: gitignore
~/.tmux.conf: tmux.conf
~/.config/nvim/init.vim: nvim.vim
~/.config/fish/config.fish: config.fish
Expand Down
6 changes: 2 additions & 4 deletions nvim.vim
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Plug 'othree/yajs.vim'
Plug 'Shougo/deoplete.nvim', { 'do': function('DoRemote') }
Plug 'Shougo/unite.vim'
Plug 'Shougo/vimfiler.vim'
Plug 'ternjs/tern_for_vim', { 'do': 'npm install' }
Plug 'tpope/vim-endwise'
Plug 'tpope/vim-rails'
Plug 'tpope/vim-surround'
Expand Down Expand Up @@ -63,12 +64,9 @@ set listchars=eol:$

nmap <c-p> :FZF<CR>
let g:tern_request_timeout = 1
let g:tern_show_signature_in_pum = 0

let g:deoplete#omni#functions = {}
let g:deoplete#omni#functions.javascript = [
\ 'tern#Complete'
\ 'tern#Complete',
\]

set completeopt=longest,menuone,preview
Expand Down

0 comments on commit 0139779

Please sign in to comment.