Merge branch 'master' of github.com:Laily123/dotfile

This commit is contained in:
2018-10-21 00:21:49 +08:00
2 changed files with 27 additions and 5 deletions
+3 -2
View File
@@ -7,9 +7,10 @@
editor = /usr/local/bin/nvim
[alias]
merge2 = "!f() { git checkout $1 && git merge $2 && git checkout -; }; f"
au = add -u
co = checkout
ci = commit
br = branch
cm = commit -m
st = status
br = branch
[push]
default = current
+24 -3
View File
@@ -1,10 +1,27 @@
### 使用
```shell
# 切换到 home 目录
cd ~
git clone git@github.com:Laily123/.dotfile.git
```
### zsh 安装
安装 zsh
`https://github.com/robbyrussell/oh-my-zsh/wiki/Installing-ZSH`
macOS
```shell
brew install zsh zsh-completions
```
安装 oh-my-zsh
`sh -c "$(wget https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O -)"`
```shell
sh -c "$(wget https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O -)"
```
初始化配置
`ln -sf ~/.dotfile/.zshrc ~/`
`ln -sf ~/.dotfile/laily.zsh-theme ~/.oh-my-zsh/themes/`
```shell
ln -sf ~/.dotfile/.zshrc ~/
ln -sf ~/.dotfile/laily.zsh-theme ~/.oh-my-zsh/themes/
```
### spacevim 安装
安装
@@ -12,4 +29,8 @@
初始化配置
`ln -sf ~/.dotfile/.SpaceVim.d ~/`
### git config
```shell
ls -sf ~/.dotfile/.gitconfig ~/.gitconfig
```