Skip to content

Commit 385553c

Browse files
author
Brian Devins-Suresh
committed
Adding private files
1 parent c1c2155 commit 385553c

File tree

2 files changed

+25
-3
lines changed

2 files changed

+25
-3
lines changed

bootstrap.sh

+17-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ LASTPASS_EMAIL_ADDRESS="[email protected]"
55
cat << EOF > /tmp/lpass_askpass
66
#!/bin/bash
77
8-
echo -n "Enter \$@: " >/dev/stderr
8+
echo -n "Enter \$@: " > /dev/stderr
99
1010
stty -echo
1111
read answer
@@ -86,7 +86,13 @@ mkdir -p "${HOME}/.ssh"
8686
lpass show --field="Private Key" ssh@personal > "${HOME}/.ssh/personal_key" && chmod 600 "${HOME}/.ssh/personal_key"
8787
lpass show --field="Public Key" ssh@personal > "${HOME}/.ssh/personal_key.pub"
8888

89-
# Clone repo
89+
cat << EOF > $HOME/.ssh/config
90+
host github.com
91+
HostName github.com
92+
IdentityFile ~/.ssh/personal_key
93+
EOF
94+
95+
# Clone repos
9096
mkdir -p "${HOME}/.local/opt"
9197
if [ -d "${HOME}/.local/opt/devbox" ]; then
9298
(
@@ -96,13 +102,21 @@ if [ -d "${HOME}/.local/opt/devbox" ]; then
96102
else
97103
git clone "${DEVBOX_REPO}" "${HOME}/.local/opt/devbox"
98104
fi
105+
if [ -d "${HOME}/.local/opt/devbox-private" ]; then
106+
(
107+
cd "${HOME}/.local/opt/devbox-private"
108+
git pull
109+
)
110+
else
111+
git clone "${DEVBOX_REPO}-private" "${HOME}/.local/opt/devbox-private"
112+
fi
99113

100114
(
101115
cd "${HOME}/.local/opt/devbox/ansible"
102116
ansible-playbook -K -i inventory site.yml
103117
)
104118

105119
# rcm
106-
echo "DOTFILES_DIRS=\"${HOME}/.local/opt/devbox/dotfiles\"" > "${HOME}/.rcrc"
120+
echo "DOTFILES_DIRS=\"${HOME}/.local/opt/devbox/dotfiles ${HOME}/.local/opt/devbox-private/dotfiles\"" > "${HOME}/.rcrc"
107121
echo "TAGS=\"$(uname)\"" >> "${HOME}/.rcrc"
108122
rcup -vf

dotfiles/zshrc

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ export XDG_CONFIG_HOME="${HOME}/.config"
33
export DOTFILES_DIR="${HOME}/.local/opt/devbox/dotfiles"
44

55
autoload -Uz compinit
6+
DATE_CMD=date
7+
if [ $(which gdate) ]; then
8+
DATE_CMD=gdate
9+
fi
610
if [ $(date +'%j') != $(date +'%j' -r ~/.zcompdump) ]; then
711
compinit -i
812
else
@@ -28,3 +32,7 @@ fi
2832
export PATH="${HOME}/.local/bin:${PATH}"
2933

3034
[ -s "${HOME}/.config/fzf/init.zsh" ] && source ${HOME}/.config/fzf/init.zsh
35+
36+
if [[ -s "${HOME}/.zshrc_private" ]]; then
37+
source "${HOME}/.zshrc_private"
38+
fi

0 commit comments

Comments
 (0)