diff --git a/README.md b/README.md index f26be1c..f452859 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,4 @@ -## Dotfiles - -Developer config files. +## Config files | Tool | Description | | -------- | ----------- | diff --git a/install.sh b/install.sh index c91b2db..8f1c55c 100755 --- a/install.sh +++ b/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -DOTFILES=$(cd "$(dirname "$0")" && pwd) +ROOTDIR=$(cd "$(dirname "$0")" && pwd) confirm() { local prompt="$1 [Y/n] " @@ -18,14 +18,14 @@ confirm() { # Install tools if [[ "$OSTYPE" == linux-gnu* ]]; then - confirm "Install Nix?" && "$DOTFILES/install/install-nix.sh" - confirm "Install Nix packages?" && "$DOTFILES/install/install-nix-packages.sh" + confirm "Install Nix?" && "$ROOTDIR/install/install-nix.sh" + confirm "Install Nix packages?" && "$ROOTDIR/install/install-nix-packages.sh" elif [[ "$OSTYPE" == darwin* ]]; then - confirm "Install Homebrew?" && "$DOTFILES/install/install-brew.sh" - confirm "Install Homebrew packages?" && "$DOTFILES/install/install-brew-packages.sh" + confirm "Install Homebrew?" && "$ROOTDIR/install/install-brew.sh" + confirm "Install Homebrew packages?" && "$ROOTDIR/install/install-brew-packages.sh" fi # Extra steps -confirm "Set login shell?" && "$DOTFILES/install/install-shell.sh" -confirm "Create symlinks?" && "$DOTFILES/install/install-symlinks.sh" -confirm "Install vim plugins?" && "$DOTFILES/install/install-vim-plugins.sh" +confirm "Set login shell?" && "$ROOTDIR/install/install-shell.sh" +confirm "Create symlinks?" && "$ROOTDIR/install/install-symlinks.sh" +confirm "Install vim plugins?" && "$ROOTDIR/install/install-vim-plugins.sh" diff --git a/install/install-brew-packages.sh b/install/install-brew-packages.sh index ca761be..6acf142 100755 --- a/install/install-brew-packages.sh +++ b/install/install-brew-packages.sh @@ -2,7 +2,7 @@ echo "***** INSTALL HOMEBREW PACKAGES *****" -DOTFILES=$(cd "$(dirname "$0")/.." && pwd) +ROOTDIR=$(cd "$(dirname "$0")/.." && pwd) # Install required tools brew install \ @@ -16,6 +16,6 @@ brew install \ tree # Install optional tools (prompted by fzf) -"$DOTFILES/install/install-brew-extra.fish" +"$ROOTDIR/install/install-brew-extra.fish" echo diff --git a/install/install-symlinks.sh b/install/install-symlinks.sh index 4666383..e96f9cd 100755 --- a/install/install-symlinks.sh +++ b/install/install-symlinks.sh @@ -2,7 +2,7 @@ echo "***** INSTALL SYMLINKS *****" -DOTFILES=$(cd "$(dirname "$0")/.." && pwd) +ROOTDIR=$(cd "$(dirname "$0")/.." && pwd) backup_existing() { if [ -e "$1" ]; then @@ -22,9 +22,9 @@ backup_existing "$HOME/.config/nvim" backup_existing "$HOME/.config/git" # Create symlinks, forcing updates -ln -fsv "$DOTFILES/bash/.bashrc" "$HOME/.bashrc" # Bash does not support XDG config -ln -fsv "$DOTFILES/fish" "$HOME/.config" -ln -fsv "$DOTFILES/nvim" "$HOME/.config" -ln -fsv "$DOTFILES/git" "$HOME/.config" +ln -fsv "$ROOTDIR/bash/.bashrc" "$HOME/.bashrc" # Bash does not support XDG config +ln -fsv "$ROOTDIR/fish" "$HOME/.config" +ln -fsv "$ROOTDIR/nvim" "$HOME/.config" +ln -fsv "$ROOTDIR/git" "$HOME/.config" echo