merge develop

.gitignore

@@ -1,6 +1 @@
 .DS_Store
-<<<<<<< HEAD
-
-Brewfile.lock.json
-=======
->>>>>>> develop

Brewfile

@@ -1,37 +1,6 @@
 cask_args appdir: "/Applications"
 
 # Taps
-<<<<<<< HEAD
-tap "homebrew/cask"
-tap "homebrew/bundle"
-tap "homebrew/services"
-tap "homebrew/cask-fonts"
-
-# brew
-brew "cloc"
-brew "wget"
-brew "node"
-brew "pnpm"
-brew "tmux"
-brew "gh"
-brew "neovim"
-brew "tree-sitter"
-brew "mysql"
-
-# Apps
-cask "alfred"
-cask "clashx"
-cask "iterm2"
-cask "qingg"
-cask "google-chrome"
-cask "visual-studio-code"
-cask "the-unarchiver"
-cask "qq"
-cask "wechat"
-
-# Fonts
-cask "font-fira-mono-nerd-font"
-=======
 tap "homebrew/bundle"
 tap "homebrew/cask"
 tap "homebrew/services"
@@ -63,4 +32,3 @@ cask "iina"
 cask "font-sf-mono"
 cask "font-symbols-only-nerd-font"
 cask "font-jetbrains-mono-nerd-font"
->>>>>>> develop

bin/dot

@@ -1,31 +1,5 @@
 #!/bin/sh
 
-<<<<<<< HEAD
-#----------------------------------------------------------------------
-# 帮助
-#----------------------------------------------------------------------
-usage() {
-cat <<EOF
-USAGE
-  $ dot [COMMANDS]
-
-COMMANDS:
-  clean
-  checkhealth
-  install
-  uninstall
-  help
-EOF
-}
-
-#----------------------------------------------------------------------
-# 入口
-#----------------------------------------------------------------------
-main() {
-  case $1 in
-    install)
-      sh $DOTPATH/cmd/install.sh "$2"
-=======
 usage() {
 cat <<EOF
 USAGE
@@ -42,7 +16,6 @@ main() {
   case $1 in
     install)
       sh $DOTDIR/cmd/install.sh "$2"
->>>>>>> develop
       ;;
     uninstall)
       sh $DOTDIR/cmd/uninstall.sh "$2"

cmd/install.sh

@@ -1,9 +1,6 @@
 #!/bin/sh
-<<<<<<< HEAD
-=======
 #
 # 安装脚本
->>>>>>> develop
 
 #######################################
 # 帮助
@@ -12,17 +9,6 @@ usage() {
 cat <<EOF
 Usage: dot install [command]
 Available Commands:
-<<<<<<< HEAD
-  brew     Homebrew 安装
-  git      Git 环境
-  iterm    终端配置
-  macos    系统偏好设置
-  neovim   NeoVim 配置
-  node     Node 环境
-  vscode   VSCode 开发环境
-  zsh      zsh 环境
-  help     帮助文档
-=======
   brew      Homebrew 安装
   git       Git 环境
   alacritty 终端配置
@@ -32,7 +18,6 @@ Available Commands:
   vscode    VSCode 开发环境
   zsh       zsh 环境
   help      帮助文档
->>>>>>> develop
 EOF
 }
 
@@ -44,34 +29,6 @@ main() {
     '')
       dot install zsh
       dot install brew
-<<<<<<< HEAD
-      dot install git
-      dot install node
-      dot install iterm
-      dot install neovim
-      dot install macos
-      ;;
-    brew)
-      sh $DOTPATH/local/brew/install.sh
-      ;;
-    git)
-      sh $DOTPATH/local/git/install.sh
-      ;;
-    iterm)
-      sh $DOTPATH/local/iterm/install.sh
-      ;;
-    macos)
-      sh $DOTPATH/local/macos/install.sh
-      ;;
-    neovim)
-      sh $DOTPATH/local/neovim/install.sh
-      ;;
-    node)
-      sh $DOTPATH/local/node/install.sh
-      ;;
-    zsh)
-      sh $DOTPATH/local/zsh/install.sh
-=======
       dot install alacritty
       dot install git
       dot install node
@@ -102,17 +59,10 @@ main() {
       ;;
     os)
       sh $DOTDIR/user/os/install.sh
->>>>>>> develop
       ;;
     help)
       usage
       ;;
-<<<<<<< HEAD
-    *)
-      echo "指定的命令无效. 请运行 dot install help."
-      ;;
-=======
->>>>>>> develop
   esac
 }
 

cmd/uninstall.sh

@@ -29,37 +29,12 @@ main() {
       dot uninstall brew
       dot uninstall git
       dot uninstall node
-<<<<<<< HEAD
-      dot uninstall iterm
-=======
       dot uninstall iterm2
->>>>>>> develop
       dot uninstall vscode
       dot uninstall neovim
       dot uninstall macos
       ;;
     brew)
-<<<<<<< HEAD
-      sh $DOTPATH/local/brew/uninstall.sh
-      ;;
-    git)
-      sh $DOTPATH/local/git/uninstall.sh
-      ;;
-    iterm)
-      sh $DOTPATH/local/iterm/uninstall.sh
-      ;;
-    neovim)
-      sh $DOTPATH/local/neovim/uninstall.sh
-      ;;
-    node)
-      sh $DOTPATH/local/node/uninstall.sh
-      ;;
-    vscode)
-      sh $DOTPATH/local/vscode/uninstall.sh
-      ;;
-    zsh)
-      sh $DOTPATH/local/zsh/uninstall.sh
-=======
       sh $DOTDIR/user/brew/uninstall.sh
       ;;
     git)
@@ -79,7 +54,6 @@ main() {
       ;;
     zsh)
       sh $DOTDIR/user/zsh/uninstall.sh
->>>>>>> develop
       ;;
     help)
       usage

etc/git/config

@@ -1,8 +1,5 @@
 [core]
 	editor = nvim
-<<<<<<< HEAD
-=======
 	excludesfile = ~/.config/git/ignore_global
 [commit]
 	template = ~/.config/git/message
->>>>>>> develop