Skip to content

Commit

Permalink
better .nvmrc handling
Browse files Browse the repository at this point in the history
atomantic committed Jul 8, 2016
1 parent a37b85b commit 5c1c6f3
Showing 4 changed files with 21 additions and 14 deletions.
4 changes: 4 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@
**Table of Contents** *generated with [DocToc](https://github.com/thlorenz/doctoc)*

- [Release History](#release-history)
- [v3.2.1](#v321)
- [v3.2.0](#v320)
- [v3.1.0](#v310)
- [v3.0.0](#v300)
@@ -14,6 +15,9 @@

# Release History

## v3.2.1
* improved handling of `.nvmrc` files on dir change

## v3.2.0
* adjust solarized theme to fix issue with rendering `mocha` test output
* https://github.com/mochajs/mocha/issues/802
15 changes: 8 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -14,11 +14,11 @@ You don't need to install or configure anything upfront! This works with a brand
- [Watch me run!](#watch-me-run)
- [Installation](#installation)
- [Restoring Dotfiles](#restoring-dotfiles)
- [3.0.0 Upgrade Instructions!](#300-upgrade-instructions)
- [Additional](#additional)
- [VIM as IDE](#vim-as-ide)
- [Crontab](#crontab)
- [Remap Caps-Lock](#remap-caps-lock)
- [License](#license)
- [Settings](#settings)
- [Configuring General System UI/UX](#configuring-general-system-uiux)
- [Standard System Changes](#standard-system-changes)
@@ -42,6 +42,7 @@ You don't need to install or configure anything upfront! This works with a brand
- [Apps](#apps)
- [NPM Global Modules](#npm-global-modules)
- [Ruby Gems](#ruby-gems)
- [License](#license)
- [Contributions](#contributions)
- [Loathing, Mehs and Praise](#loathing-mehs-and-praise)
- [¯\\_(ツ)_/¯ Warning / Liability](#%C2%AF%5C%5C_%E3%83%84_%C2%AF-warning--liability)
@@ -107,7 +108,7 @@ Do the following to upgrade your ~/.dotfiles safely:
# Additional

## VIM as IDE
I am moving away from using Atom and instead using vim as my IDE. I use Vundle to manage vim plugins (instead of pathogen). Vundle is better in many ways and is compatible with pathogen plugins. Additionally, vundle will manage and install it's own plugins so we don't have to use git submodules for all of them.
I am moving away from using `Atom` and instead using `vim` as my IDE. I use Vundle to manage vim plugins (instead of pathogen). Vundle is better in many ways and is compatible with pathogen plugins. Additionally, vundle will manage and install it's own plugins so we don't have to use git submodules for all of them.

## Crontab
You can `cron ~/.crontab` if you want to add my nightly cron software updates.
@@ -118,9 +119,6 @@ You can `cron ~/.crontab` if you want to add my nightly cron software updates.
- I highly recommend remapping your Caps Lock key to Control per [Dr. Bunsen](http://www.drbunsen.org/remapping-caps-lock/):
![Remap Caps Lock](https://raw.githubusercontent.com/atomantic/dotfiles/master/img/remap_capslock.png)

# License
This project is licensed under ISC. Please fork, contribute and share.

# Settings
This project changes a number of settings and configures software on OSX.
Here is the current list:
@@ -261,7 +259,7 @@ Here is the current list:
- Installing the Solarized Dark theme for iTerm
- Don’t display the annoying prompt when quitting iTerm
- Hide tab title bars
- Set system-wide hotkey to show/hide iterm with ^`
- Set system-wide hotkey to show/hide iterm with ctrl+tick ( `^` + `)
- Set normal font to Hack 12pt
- Set non-ascii font to Roboto Mono for Powerline 12pt

@@ -354,6 +352,9 @@ The following is the software that I have set as default:
## Ruby Gems
* git-up

# License
This project is licensed under ISC. Please fork, contribute and share.

# Contributions
Contributions are always welcome in the form of pull requests with explanatory comments.

@@ -363,7 +364,7 @@ Please refer to the [Contributor Covenant](https://github.com/atomantic/dotfiles
1. Loathing should be directed into pull requests that make it better. woot.
2. Bugs with the setup should be put as GitHub issues.
3. Mehs should be > /dev/null
4. Praise should be directed to ![@antic](https://img.shields.io/twitter/follow/antic.svg?style=social&label=Follow)
4. Praise should be directed to ![@antic](https://img.shields.io/twitter/follow/antic.svg?style=social&label=@antic)


# ¯\\_(ツ)_/¯ Warning / Liability
14 changes: 8 additions & 6 deletions homedir/.zshrc
Original file line number Diff line number Diff line change
@@ -35,14 +35,16 @@ source $ZSH/oh-my-zsh.sh

source /usr/local/opt/nvm/nvm.sh

# load .nvmrc
function chpwd() {
emulate -L zsh
if [[ -f .nvmrc ]] then
nvm use `cat .nvmrc`
autoload -U add-zsh-hook
load-nvmrc() {
if [[ -f .nvmrc && -r .nvmrc ]]; then
nvm use &> /dev/null
elif [[ $(nvm version) != $(nvm version default) ]]; then
nvm use default &> /dev/null
fi
}
[[ -f .nvmrc ]] && nvm use `cat .nvmrc`
add-zsh-hook chpwd load-nvmrc
load-nvmrc

# Customize to your needs...
unsetopt correct
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dotfiles",
"version": "3.1.0",
"version": "3.2.1",
"description": "atomantic dotfiles for osx",
"main": "index.js",
"scripts": {

0 comments on commit 5c1c6f3

Please sign in to comment.