diff --git a/.gitmodules b/.gitmodules index 16431db..5466b08 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,3 +22,12 @@ [submodule "fonts/powerline"] path = fonts/powerline url = https://github.com/powerline/fonts.git +[submodule "nodenv/plugins/node-build"] + path = nodenv/plugins/node-build + url = https://github.com/nodenv/node-build.git +[submodule "nodenv/plugins/nodenv-package-rehash"] + path = nodenv/plugins/nodenv-package-rehash + url = https://github.com/nodenv/nodenv-package-rehash.git +[submodule "nodenv/plugins/nodenv-update"] + path = nodenv/plugins/nodenv-update + url = https://github.com/nodenv/nodenv-update.git diff --git a/install.conf.json b/install.conf.json index 0044f6a..f989127 100644 --- a/install.conf.json +++ b/install.conf.json @@ -18,15 +18,20 @@ "force": true, "path": "git/gitconfig" }, + "~/.gitignore": "git/gitignore", "~/.zshrc": "zsh/zshrc", - "~/.antigenrc": "zsh/antigenrc" + "~/.antigenrc": "zsh/antigenrc", + + "~/.nodenv/plugins": "nodenv/plugins" } }, { "shell": [ ["git submodule update --init --recursive", "updating submodules"], - ["./fonts/powerline/install.sh", "installing Powerline Fonts"] + ["./fonts/powerline/install.sh", "installing Powerline Fonts"], + ["nodenv update", "updating nodenv"], + ["nodenv package-hooks install --all", "installing nodenv package hooks"] ] } ] diff --git a/nodenv/plugins/node-build b/nodenv/plugins/node-build new file mode 160000 index 0000000..5dc71b9 --- /dev/null +++ b/nodenv/plugins/node-build @@ -0,0 +1 @@ +Subproject commit 5dc71b9f576f33232572d70187ea09db28284ca3 diff --git a/nodenv/plugins/nodenv-package-rehash b/nodenv/plugins/nodenv-package-rehash new file mode 160000 index 0000000..340f65b --- /dev/null +++ b/nodenv/plugins/nodenv-package-rehash @@ -0,0 +1 @@ +Subproject commit 340f65ba74c84b708ae1779a9eef10d60ab42e97 diff --git a/nodenv/plugins/nodenv-update b/nodenv/plugins/nodenv-update new file mode 160000 index 0000000..065e983 --- /dev/null +++ b/nodenv/plugins/nodenv-update @@ -0,0 +1 @@ +Subproject commit 065e98311d165eab32420f66d1adabf49f274a60 diff --git a/readme.md b/readme.md index fcc7108..2b55239 100644 --- a/readme.md +++ b/readme.md @@ -6,7 +6,7 @@ assumes `homebrew` and `git` are already installed. ```bash https://github.com/csell5/dotfiles.git; -brew install zsh zsh-completions antigen; +brew install zsh zsh-completions antigen nodenv; sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"; cd ./dotfiles; ./install @@ -52,4 +52,8 @@ git submodule add --force https://github.com/airblade/vim-gitgutter.git vim/bund git submodule add --force https://github.com/tpope/vim-repeat.git vim/bundle/vim-repeat; git submodule add --force https://github.com/tpope/vim-surround.git vim/bundle/vim-surround; git submodule add --force https://github.com/itchyny/lightline.vim.git vim/bundle/lightline; +git submodule add --force https://github.com/nodenv/node-build.git nodenv/plugins/node-build; +git submodule add --force https://github.com/nodenv/nodenv-package-rehash.git nodenv/plugins/nodenv-package-rehash; +git submodule add --force https://github.com/nodenv/nodenv-update.git nodenv/plugins/nodenv-update; + ``` diff --git a/zsh/antigenrc b/zsh/antigenrc index ce5fcc1..e236d8b 100644 --- a/zsh/antigenrc +++ b/zsh/antigenrc @@ -11,9 +11,6 @@ antigen bundle zsh-users/zsh-syntax-highlighting # Fish-like auto suggestions antigen bundle zsh-users/zsh-autosuggestions -# NVM https://github.com/lukechilds/zsh-nvm -antigen bundle lukechilds/zsh-nvm - antigen theme denysdovhan/spaceship-prompt # apply bundles diff --git a/zsh/zshrc b/zsh/zshrc index c4d0551..c9ef948 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -2,8 +2,8 @@ # export PATH=$HOME/bin:/usr/local/bin:$PATH # Path to your oh-my-zsh installation. -export ZSH="/Users/csell5/.oh-my-zsh" -export NVM_AUTO_USE=true +export ZSH="$HOME/.oh-my-zsh" +# export NVM_AUTO_USE=true # Set name of the theme to load --- if set to "random", it will # load a random theme each time oh-my-zsh is loaded, in which case, @@ -69,7 +69,6 @@ plugins=( source $ZSH/oh-my-zsh.sh - # User configuration # antigen loaded @@ -106,3 +105,6 @@ antigen init $HOME/.antigenrc # initalize completions fpath=(/usr/local/share/zsh-completions $fpath) + +# loads nodenv +eval "$(nodenv init -)" \ No newline at end of file