Merge branch 'master' of github.com:Laily123/dotfile
This commit is contained in:
+3
-2
@@ -7,9 +7,10 @@
|
|||||||
editor = /usr/local/bin/nvim
|
editor = /usr/local/bin/nvim
|
||||||
[alias]
|
[alias]
|
||||||
merge2 = "!f() { git checkout $1 && git merge $2 && git checkout -; }; f"
|
merge2 = "!f() { git checkout $1 && git merge $2 && git checkout -; }; f"
|
||||||
|
au = add -u
|
||||||
co = checkout
|
co = checkout
|
||||||
ci = commit
|
cm = commit -m
|
||||||
br = branch
|
|
||||||
st = status
|
st = status
|
||||||
|
br = branch
|
||||||
[push]
|
[push]
|
||||||
default = current
|
default = current
|
||||||
|
|||||||
@@ -1,10 +1,27 @@
|
|||||||
|
### 使用
|
||||||
|
```shell
|
||||||
|
# 切换到 home 目录
|
||||||
|
cd ~
|
||||||
|
git clone git@github.com:Laily123/.dotfile.git
|
||||||
|
```
|
||||||
|
|
||||||
### zsh 安装
|
### zsh 安装
|
||||||
安装 zsh
|
安装 zsh
|
||||||
|
`https://github.com/robbyrussell/oh-my-zsh/wiki/Installing-ZSH`
|
||||||
|
macOS
|
||||||
|
```shell
|
||||||
|
brew install zsh zsh-completions
|
||||||
|
```
|
||||||
|
|
||||||
安装 oh-my-zsh
|
安装 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 ~/`
|
```shell
|
||||||
`ln -sf ~/.dotfile/laily.zsh-theme ~/.oh-my-zsh/themes/`
|
ln -sf ~/.dotfile/.zshrc ~/
|
||||||
|
ln -sf ~/.dotfile/laily.zsh-theme ~/.oh-my-zsh/themes/
|
||||||
|
```
|
||||||
|
|
||||||
### spacevim 安装
|
### spacevim 安装
|
||||||
安装
|
安装
|
||||||
@@ -12,4 +29,8 @@
|
|||||||
初始化配置
|
初始化配置
|
||||||
`ln -sf ~/.dotfile/.SpaceVim.d ~/`
|
`ln -sf ~/.dotfile/.SpaceVim.d ~/`
|
||||||
|
|
||||||
|
### git config
|
||||||
|
```shell
|
||||||
|
ls -sf ~/.dotfile/.gitconfig ~/.gitconfig
|
||||||
|
```
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user