Skip to content

Commit

Permalink
Switch to neovim
Browse files Browse the repository at this point in the history
Vim was giving me static: every time I opened a file, I had to Ctrl-C
before text would appear.  Then when I tried to save, it would warn me
"file already exists".  Then when I tried to open another file in a tab
or split, it just wouldn't work.

Installing the neovim python package is currently necessary to make
`nvim +PlugInstall` work right: junegunn/vim-plug#104
  • Loading branch information
nicknovitski committed Oct 30, 2015
1 parent 84d1608 commit a445ebf
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 19 deletions.
8 changes: 5 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ RUN pacman -Syu --noconfirm
RUN pacman-db-upgrade

RUN pacman -S --noconfirm base-devel man openssh wget unzip yajl \
git vim tmux bash-completion ctags docker gtypist parallel ruby-mustache links \
git tmux bash-completion ctags docker gtypist parallel ruby-mustache links \
weechat sdcv emacs python2-pip xml2 rlwrap

RUN pip2 install awscli
RUN pip2 install awscli neovim

RUN curl --silent https://thoughtbot.github.io/rcm/dist/rcm-1.2.3.tar.gz | tar xz && \
cd rcm-1.2.3 && \
Expand Down Expand Up @@ -64,9 +64,11 @@ RUN /tmp/github-install /home/dev/.rbenv/plugins \
tpope/rbenv-ctags \
tpope/rbenv-sentience

RUN yaourt -Sy --noconfirm neovim-git

ADD dotfiles /home/dev/.dotfiles
RUN rcup -v
RUN vim +PlugInstall +qall
RUN nvim +PlugInstall +qall --headless
RUN sudo wget -q https://raw.githubusercontent.com/travis-ci/travis.rb/master/assets/travis.sh -O /etc/profile.d/travis-autocompletion.sh
ADD profile.d/*.sh /etc/profile.d/
ADD usr-local-bin/* /usr/local/bin/
Expand Down
File renamed without changes.
16 changes: 3 additions & 13 deletions dotfiles/vimrc → dotfiles/config/nvim/init.vim
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
" Note: Skip initialization for vim-tiny or vim-small.
if !1 | finish | endif

if has('vim_starting')
if &compatible
set nocompatible " Be iMproved
endif
endif

" download vim-plug if necessary
if empty(glob('~/.vim/autoload/plug.vim'))
silent !curl --silent -fLo ~/.vim/autoload/plug.vim --create-dirs
if empty(glob('~/.config/nvim/autoload/plug.vim'))
silent !curl --silent -fLo ~/.config/nvim/autoload/plug.vim --create-dirs
\ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
autocmd VimEnter * PlugInstall
endif
Expand Down Expand Up @@ -37,7 +28,6 @@ Plug 'rodjek/vim-puppet'
Plug 'rust-lang/rust.vim'
Plug 'scrooloose/syntastic'
Plug 'Shougo/unite.vim' | Plug 'Quramy/vison'
Plug 'Shougo/vimproc.vim', { 'do' : 'make' }
Plug 'tpope/vim-abolish'
Plug 'tpope/vim-bundler'
Plug 'tpope/vim-commentary'
Expand Down Expand Up @@ -79,7 +69,7 @@ set scrolloff=4

" persistent undo history
set undofile
set undodir=$HOME/.vim/undo
set undodir=$HOME/.config/.nvim/undo
silent call system('mkdir -p ' . &undodir)

" disable spacebar right-motion in normal mode
Expand Down
2 changes: 1 addition & 1 deletion profile.d/stardict.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export STARDICT_DIR="${HOME}/.vim/plugged/vim-stardict"
export STARDICT_DIR="${HOME}/.config/nvim/plugged/vim-stardict"
source "${STARDICT_DIR}"/bindings/bash/stardict.sh

alias def="stardict"
Expand Down
6 changes: 4 additions & 2 deletions profile.d/vim.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
export EDITOR=vim
alias vi=vim
export XDG_CONFIG_HOME="$HOME/.config"
export EDITOR=nvim
alias vim=nvim
alias vi=nvim

0 comments on commit a445ebf

Please sign in to comment.