From 9ba8c9266e6f510e88ee4381fba247bb82c8bbfe Mon Sep 17 00:00:00 2001 From: kn1cht Date: Sun, 14 Oct 2018 19:27:25 +0900 Subject: [PATCH] various changes --- .gitconfig | 9 +++++---- .npmrc | 1 + .vimrc | 4 +--- .zshrc | 7 ++++++- README.md | 3 +-- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.gitconfig b/.gitconfig index 04cc29b..e1e60c7 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,12 +1,13 @@ [core] excludesfile = ~/.gitignore_global whitespace = cr-at-eol - autocrlf = false + autocrlf = false + pager = LESSCHARSET=utf-8 less [difftool "sourcetree"] cmd = opendiff \"$LOCAL\" \"$REMOTE\" path = [mergetool "sourcetree"] - cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\" + cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\" trustExitCode = true [user] name = kn1cht @@ -14,8 +15,8 @@ [filter "lfs"] required = true clean = git-lfs clean -- %f - smudge = git-lfs smudge -- %f - process = git-lfs filter-process + smudge = git-lfs smudge -- %f + process = git-lfs filter-process [commit] template = ~/.stCommitMsg [pager] diff --git a/.npmrc b/.npmrc index 6216c8b..67f2316 100644 --- a/.npmrc +++ b/.npmrc @@ -1,2 +1,3 @@ registry=http://registry.npmjs.org/ strict-ssl=false +python=python2.7 diff --git a/.vimrc b/.vimrc index 9c25b7a..7b16a69 100644 --- a/.vimrc +++ b/.vimrc @@ -145,11 +145,9 @@ call neobundle#begin(expand('~/.vim/bundle/')) NeoBundleFetch 'Shougo/neobundle.vim' NeoBundle 'Shougo/neocomplete.vim' -NeoBundle 'scrooloose/nerdtree' +NeoBundleLazy 'scrooloose/nerdtree' NeoBundle 'Townk/vim-autoclose' NeoBundle 'mbbill/undotree' -NeoBundle 'mattn/emmet-vim' -NeoBundle 'davidhalter/jedi-vim' call neobundle#end() filetype plugin indent on diff --git a/.zshrc b/.zshrc index 1327293..106a607 100644 --- a/.zshrc +++ b/.zshrc @@ -34,6 +34,8 @@ alias grep='grep -E --color=auto' alias mkdir='mkdir -p' alias sudo='sudo ' alias rot13='tr A-Za-z N-ZA-Mn-za-m' +alias g='cd $(ghq root)/$(ghq list | peco)' +alias gh='hub browse $(ghq list | peco | cut -d "/" -f 2,3)' if [ "$(uname)" = 'Darwin' ]; then export LSCOLORS=xbfxcxdxbxegedabagacad @@ -56,6 +58,9 @@ export PATH=$HOME/.rbenv/bin:~/Library/Python/2.7/bin:~/.go/bin:$PATH export PATH=/Applications/microchip/xc8/v1.35/bin:$PATH export PATH=/usr/local/share/git-core/contrib/diff-highlight:$PATH export PATH=$HOME/isrb2:$PATH +export PATH=${HOME}/perl5/bin:$PATH export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig -eval "$(rbenv init -)" +eval "$(anyenv init -)" +eval $(docker-machine env default) export LC_COLLATE="C" + diff --git a/README.md b/README.md index e221fb2..f86a5b0 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # dotfiles ``` -$ git clone https://github.com/kn1cht/dotfiles.git -$ git submodule update --init --recursive +$ git clone https://github.com/kn1cht/dotfiles.git --recursive $ make ```