Skip to content

Commit

Permalink
various changes
Browse files Browse the repository at this point in the history
  • Loading branch information
kn1cht committed Oct 14, 2018
1 parent b1e763b commit 9ba8c92
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 10 deletions.
9 changes: 5 additions & 4 deletions .gitconfig
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
[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
email = [email protected]
[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]
Expand Down
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
registry=http://registry.npmjs.org/
strict-ssl=false
python=python2.7
4 changes: 1 addition & 3 deletions .vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 6 additions & 1 deletion .zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"

3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -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
```

0 comments on commit 9ba8c92

Please sign in to comment.