diff --git a/.gitmodules b/.gitmodules index 73ebea7..a257b20 100644 --- a/.gitmodules +++ b/.gitmodules @@ -46,3 +46,6 @@ [submodule "vim/.vim/bundle/bats"] path = vim/.vim/bundle/bats url = https://github.com/vim-scripts/bats.vim +[submodule "nvim/.config/nvim/plug"] + path = nvim/.config/nvim/plug + url = https://github.com/junegunn/vim-plug diff --git a/config.sh b/config.sh index 4b3c650..91eded1 100755 --- a/config.sh +++ b/config.sh @@ -6,4 +6,5 @@ stow -t ~ vim stow -t ~ slate stow -t ~ iex stow -t ~ tmux +stow -t ~ nvim diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim new file mode 100644 index 0000000..783eaed --- /dev/null +++ b/nvim/.config/nvim/init.vim @@ -0,0 +1,9 @@ +source $HOME/.config/nvim/plug/plug.vim +source $HOME/.config/nvim/plugs.vim + +map :NERDTreeToggle + +"set splitright +"set splitbelow + + diff --git a/nvim/.config/nvim/plug b/nvim/.config/nvim/plug new file mode 160000 index 0000000..734d9a1 --- /dev/null +++ b/nvim/.config/nvim/plug @@ -0,0 +1 @@ +Subproject commit 734d9a11b5a6354e6a66e152dee5d311233e033c diff --git a/nvim/.config/nvim/plugs.vim b/nvim/.config/nvim/plugs.vim new file mode 100644 index 0000000..ea4ea55 --- /dev/null +++ b/nvim/.config/nvim/plugs.vim @@ -0,0 +1,81 @@ +call plug#begin('~/local/.shared/nvim/plugged') + +" File navigation +Plug 'scrooloose/nerdtree' + +" git utlities +Plug 'tpope/vim-fugitive' " Git integration +Plug 'airblade/vim-gitgutter' " Shows a diff in the gutter + +" [submodule "bundle/airline"] +" path = vim/.vim/bundle/airline +" url = https://github.com/vim-airline/vim-airline +" [submodule "bundle/vim-colorschemes"] +" path = vim/.vim/bundle/colorschemes +" url = https://github.com/flazz/vim-colorschemes +" [submodule "bundle/vimwiki"] +" path = vim/.vim/bundle/vimwiki +" url = https://github.com/vimwiki/vimwiki.git +" [submodule "bundle/vim-graphql"] +" path = vim/.vim/bundle/vim-graphql +" url = https://github.com/jparise/vim-graphql +" [submodule "bundle/typescript-vim"] +" path = vim/.vim/bundle/typescript-vim +" url = https://github.com/leafgarland/typescript-vim +" [submodule "bundle/vim-elixir"] +" path = vim/.vim/bundle/vim-elixir +" url = https://github.com/elixir-lang/vim-elixir.git +" [submodule "vim/.vim/bundle/alchemist"] +" path = vim/.vim/bundle/alchemist +" url = https://github.com/slashmili/alchemist.vim +" [submodule "vim/.vim/bundle/vim-css-color"] +" path = vim/.vim/bundle/vim-css-color +" url = https://github.com/ap/vim-css-color +" [submodule "vim/.vim/bundle/vim-terraform"] +" path = vim/.vim/bundle/vim-terraform +" url = https://github.com/hashivim/vim-terraform.git +" [submodule "vim/.vim/bundle/ctrlp"] +" path = vim/.vim/bundle/ctrlp +" url = https://github.com/ctrlpvim/ctrlp.vim +" [submodule "vim/.vim/bundle/elm-vim"] +" path = vim/.vim/bundle/elm-vim +" url = https://github.com/ElmCast/elm-vim +" + + +" Plug 'ap/vim-css-color' " Highlight hex colors +" Plug 'autozimu/LanguageClient-neovim', { 'branch': 'next', 'do': 'bash install.sh' } " LSP +" Plug 'christoomey/vim-tmux-navigator' " Navigate vim and tmux panes the same way +" Plug 'dhruvasagar/vim-table-mode' " Easy markdown table editing +" Plug 'easymotion/vim-easymotion' " Jump to characters +" Plug 'haya14busa/incsearch.vim' " Improved searching +" Plug 'iamcco/markdown-preview.vim' " Markdown preview +" Plug 'iamcco/mathjax-support-for-mkdp' " Mathjax markdown +" Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --bin' } " fzf binary +" Plug 'junegunn/fzf.vim' " fzf vim plugin +" Plug 'mattn/emmet-vim' " emmet HTML editing +" Plug 'maxbrunsfeld/vim-yankstack' " Cycle through yanked items +" Plug 'mileszs/ack.vim' " Search across files +" Plug 'mtth/scratch.vim' " Scratchpad +" Plug 'raimondi/delimitmate' " Auto-complete quotes, parens, etc. +" Plug 'reasonml-editor/vim-reason-plus' " Reason syntax highlighting +" Plug 'scrooloose/nerdcommenter' " Automatically comment lines +" Plug 'scrooloose/nerdtree' " NERDTree +" Plug 'sheerun/vim-polyglot' " Automatic syntax highlighting +" Plug 'shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins', 'commit': '865747efe41ea1d923758617d71e8e5b59da292e' } " Auto-completion +" Plug 'sirver/ultisnips' " Snippet engine +" Plug 'sjl/gundo.vim' " Visual undo tree +" Plug 'slashmili/alchemist.vim' " Elixir support +" Plug 'styled-components/vim-styled-components' " Styled-components highlighting +" Plug 'terryma/vim-expand-region' " Expand visually selected region +" Plug 'tomasr/molokai' " Colorscheme +" Plug 'tpope/tpope-vim-abolish' " Abbreviation, Substitution, Coercion +" Plug 'tpope/vim-endwise' " Auto-insert do/end +" Plug 'tpope/vim-obsession' " Save and restore sessions +" Plug 'tpope/vim-repeat' " Use . for more complex commands +" Plug 'tpope/vim-surround' " Surrounding things in characters +" Plug 'tpope/vim-unimpaired' " Simple mappings for transforming text +" Plug 'vim-airline/vim-airline' " 'powerline'-like status bar +" Plug 'wellle/targets.vim' " More text objects to operate on (edit next parens) +call plug#end() + diff --git a/nvim/.config/nvim/plugs/config.vim b/nvim/.config/nvim/plugs/config.vim new file mode 100644 index 0000000..e69de29 diff --git a/nvim/.config/nvim/plugs/install.vim b/nvim/.config/nvim/plugs/install.vim new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/nvim/.config/nvim/plugs/install.vim @@ -0,0 +1 @@ + diff --git a/nvim/.config/nvim/plugs/update.vim b/nvim/.config/nvim/plugs/update.vim new file mode 100644 index 0000000..e69de29