diff --git a/.gitmodules b/.gitmodules index 1af14d0..0e5f07b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,3 +2,6 @@ path = dotbot url = https://github.com/anishathalye/dotbot ignore = dirty +[submodule "plugins/brew"] + path = plugins/brew + url = https://github.com/d12frosted/dotbot-brew.git diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..94d01f1 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "editor.tabSize": 2, + "editor.insertSpaces": false, + "editor.detectIndentation": false +} diff --git a/files/git/config.personal b/files/git/config.personal new file mode 100644 index 0000000..fd1a420 --- /dev/null +++ b/files/git/config.personal @@ -0,0 +1,4 @@ +[user] + name = cupcakearmy + email = hi@nicco.io + signingkey = 3235314B4D31232F diff --git a/files/git/gitconfig b/files/git/gitconfig index 3209ab5..3b68c1f 100644 --- a/files/git/gitconfig +++ b/files/git/gitconfig @@ -1,6 +1,3 @@ -[user] - name = cupcakearmy - email = hi@nicco.io [filter "lfs"] clean = git-lfs clean -- %f smudge = git-lfs smudge -- %f @@ -12,5 +9,8 @@ [commit] gpgsign = true +[includeIf "gitdir:/Users/nicco/"] + path = "~/.dotfiles/files/git/config.personal" + [includeIf "gitdir:/Users/niccolo.borgioli/"] path = "~/.dotfiles/files/git/config.work" diff --git a/install b/install index 5a7e72c..356a1bb 100755 --- a/install +++ b/install @@ -12,4 +12,4 @@ cd "${BASEDIR}" git -C "${DOTBOT_DIR}" submodule sync --quiet --recursive git submodule update --init --recursive "${DOTBOT_DIR}" -"${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}" -d "${BASEDIR}" -c "${CONFIG}" "${@}" +"${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}" -d "${BASEDIR}" --plugin-dir plugins/brew -c "${CONFIG}" "${@}" diff --git a/install.conf.yaml b/install.conf.yaml index bf0864c..5470daa 100644 --- a/install.conf.yaml +++ b/install.conf.yaml @@ -1,17 +1,20 @@ - defaults: - link: - create: true - relink: true - force: true + link: + create: true + relink: true + force: true - clean: ["~"] - link: - ~/.gitconfig: files/git/gitconfig - ~/.vim: files/vim - ~/.vimrc: files/vimrc - ~/.config/fish: files/fish - ~/.config/omf: files/omf + ~/.gitconfig: files/git/gitconfig + ~/.vim: files/vim + ~/.vimrc: files/vimrc + ~/.config/fish: files/fish + ~/.config/omf: files/omf - shell: - - [git submodule update --init --recursive, Installing submodules] + - [git submodule update --init --recursive, Installing submodules] + +# Brew plugin +- brew: [gnupg, fish, git-lfs, htop, n]