Skip to content
This repository has been archived by the owner on Jul 5, 2023. It is now read-only.

Commit

Permalink
ZSH -> DOTFILES
Browse files Browse the repository at this point in the history
  • Loading branch information
caarlos0 committed Sep 28, 2016
1 parent 1bdde0e commit 874c325
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions antibody/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ else
curl -sL https://git.io/vwMNi | sh -s
fi

antibody bundle < "$ZSH/antibody/bundles.txt" > ~/.bundles.txt
antibody bundle < "$DOTFILES/antibody/bundles.txt" > ~/.bundles.txt
antibody bundle sindresorhus/pure >> ~/.bundles.txt
antibody bundle < "$ZSH/antibody/last_bundles.txt" >> ~/.bundles.txt
antibody bundle < "$DOTFILES/antibody/last_bundles.txt" >> ~/.bundles.txt
8 changes: 4 additions & 4 deletions bin/dot_update
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#
# `dot_update` handles installation, updates, things like that. Run it
# periodically to make sure you're on the latest and greatest.
export ZSH="$HOME/.dotfiles"
cd "$ZSH" || exit 1
export DOTFILES="$HOME/.dotfiles"
cd "$DOTFILES" || exit 1

# fixes PATH (we could be running from the crontab)
PATH="$(command -p getconf PATH):/usr/local/bin"
Expand All @@ -23,8 +23,8 @@ echo "› submodules update"
git submodule update --init --recursive --remote --merge --quiet

# Run all installs
echo "$ZSH/script/install"
"$ZSH/script/install"
echo "$DOTFILES/script/install"
"$DOTFILES/script/install"

if which antibody >/dev/null 2>&1; then
echo "› antibody update"
Expand Down
2 changes: 1 addition & 1 deletion functions/_d
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#compdef d
_files -W $ZSH -/
_files -W $DOTFILES -/
2 changes: 1 addition & 1 deletion functions/d
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/sh
# shellcheck disable=SC2164
cd "$ZSH/$1"
cd "$DOTFILES/$1"
4 changes: 2 additions & 2 deletions iterm/install.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh
[ "$(uname -s)" != "Darwin" ] && exit 0
sed "s;/Users/carlos;$HOME;g" \
"$ZSH"/iterm/com.googlecode.iterm2.plist.example > "$ZSH"/iterm/com.googlecode.iterm2.plist
defaults write com.googlecode.iterm2 "PrefsCustomFolder" -string "$ZSH/iterm"
"$DOTFILES"/iterm/com.googlecode.iterm2.plist.example > "$DOTFILES"/iterm/com.googlecode.iterm2.plist
defaults write com.googlecode.iterm2 "PrefsCustomFolder" -string "$DOTFILES/iterm"
defaults write com.googlecode.iterm2 "LoadPrefsFromCustomFolder" -bool true
2 changes: 1 addition & 1 deletion system/path.zsh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
export PATH="$PATH:$ZSH/bin"
export PATH="$PATH:$DOTFILES/bin"
2 changes: 1 addition & 1 deletion terminator/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
[ "$(uname -s)" = "Darwin" ] && exit 0
test -z "$KEEP_TERMINATOR" || exit 0
mkdir -p ~/.config/terminator/
ln -sf "$ZSH"/terminator/config ~/.config/terminator/config
ln -sf "$DOTFILES"/terminator/config ~/.config/terminator/config
4 changes: 2 additions & 2 deletions vscode/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ if test "$(which code)"; then
VSCODE_HOME="$HOME/.config/Code"
fi

ln -sf "$ZSH/vscode/settings.json" "$VSCODE_HOME/User/settings.json"
ln -sf "$ZSH/vscode/keybindings.json" "$VSCODE_HOME/User/keybindings.json"
ln -sf "$DOTFILES/vscode/settings.json" "$VSCODE_HOME/User/settings.json"
ln -sf "$DOTFILES/vscode/keybindings.json" "$VSCODE_HOME/User/keybindings.json"

modules="
Borke.Puppet
Expand Down
4 changes: 2 additions & 2 deletions zsh/config.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
export LSCOLORS='exfxcxdxbxegedabagacad'
export CLICOLOR=true

fpath=($ZSH/functions $fpath)
fpath=($DOTFILES/functions $fpath)

autoload -U "$ZSH"/functions/*(:t)
autoload -U "$DOTFILES"/functions/*(:t)

HISTFILE=~/.zsh_history
HISTSIZE=10000
Expand Down
2 changes: 1 addition & 1 deletion zsh/fpath.zsh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/zsh
#add each topic folder to fpath so that they can add functions and completion scripts
for topic_folder ($ZSH/*) if [ -d "$topic_folder" ]; then
for topic_folder ($DOTFILES/*) if [ -d "$topic_folder" ]; then
fpath=($topic_folder $fpath)
fi
6 changes: 3 additions & 3 deletions zsh/zshrc.symlink
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/zsh
# shortcut to this dotfiles path is $ZSH
export ZSH="$HOME/.dotfiles"
# shortcut to this dotfiles path is $DOTFILES
export DOTFILES="$HOME/.dotfiles"

# your project folder that we can `c [tab]` to
export PROJECTS="$HOME/Code"
Expand All @@ -10,7 +10,7 @@ export EDITOR='code'

# all of our zsh files
typeset -U config_files
config_files=($ZSH/*/*.zsh)
config_files=($DOTFILES/*/*.zsh)

# load the path files
for file in ${(M)config_files:#*/path.zsh}; do
Expand Down

0 comments on commit 874c325

Please sign in to comment.