Browse Source

Big update

Moved stuff into a home directory to seperate it out.

Changed the names of the dotfiles to re-include the dot at the start of their
name.

Moved the scripts into an appropriate folder and updated the bootstrap script
to be more agnostic about where thigs are located.

Finally updated the submodule locations
master
Drew Short 9 years ago
parent
commit
fa75e2c6b7
  1. 16
      .gitmodules
  2. 0
      home/.gitconfig
  3. 0
      home/.vim/bundle/nerdtree
  4. 0
      home/.vim/bundle/rust.vim
  5. 0
      home/.vim/bundle/vim-markdown
  6. 0
      home/.vim/bundle/vimoutliner
  7. 0
      home/.vimrc
  8. 0
      home/.zshrc
  9. 24
      scripts/bootstrap.sh
  10. 1
      scripts/installers/README

16
.gitmodules

@ -1,12 +1,12 @@
[submodule ".vim/bundle/nerdtree"]
path = .vim/bundle/nerdtree
[submodule "home/.vim/bundle/nerdtree"]
path = home/.vim/bundle/nerdtree
url = https://github.com/scrooloose/nerdtree.git url = https://github.com/scrooloose/nerdtree.git
[submodule ".vim/bundle/rust.vim"]
path = .vim/bundle/rust.vim
[submodule "home/.vim/bundle/rust.vim"]
path = home/.vim/bundle/rust.vim
url = https://github.com/rust-lang/rust.vim.git url = https://github.com/rust-lang/rust.vim.git
[submodule ".vim/bundle/vim-markdown"]
path = .vim/bundle/vim-markdown
[submodule "home/.vim/bundle/vim-markdown"]
path = home/.vim/bundle/vim-markdown
url = https://github.com/plasticboy/vim-markdown.git url = https://github.com/plasticboy/vim-markdown.git
[submodule ".vim/bundle/vimoutliner"]
path = .vim/bundle/vimoutliner
[submodule "home/.vim/bundle/vimoutliner"]
path = home/.vim/bundle/vimoutliner
url = https://github.com/vimoutliner/vimoutliner.git url = https://github.com/vimoutliner/vimoutliner.git

0
gitconfig → home/.gitconfig

0
.vim/bundle/nerdtree → home/.vim/bundle/nerdtree

0
.vim/bundle/rust.vim → home/.vim/bundle/rust.vim

0
.vim/bundle/vim-markdown → home/.vim/bundle/vim-markdown

0
.vim/bundle/vimoutliner → home/.vim/bundle/vimoutliner

0
vimrc → home/.vimrc

0
zshrc → home/.zshrc

24
bootstrap.sh → scripts/bootstrap.sh

@ -16,7 +16,7 @@ link() {
cp "$1/$2" "$1/$2.old" cp "$1/$2" "$1/$2.old"
echo "Backed up original $2 to $1/$2.old" echo "Backed up original $2 to $1/$2.old"
fi fi
ln -sf "$PWD/$3" "$1/$2"
ln -sf "$3" "$1/$2"
} }
link_dir() { link_dir() {
@ -36,8 +36,15 @@ link_dir() {
set -x set -x
set -e set -e
# Step out of the script directory and into the main dotfiles directory
cd ..
# Store the path to the root directory and the reference home directory
DOTFILES_DIR="$PWD"
DOTFILES_HOME="$DOTFILES_DIR/home"
# Configure .vimrc # Configure .vimrc
link "$HOME" ".vimrc" "vimrc"
link "$HOME" ".vimrc" "$DOTFILES_HOME/.vimrc"
# Download pathogen if it doesn't exist already # Download pathogen if it doesn't exist already
VIM_AUTOLOAD=$HOME/.vim/autoload VIM_AUTOLOAD=$HOME/.vim/autoload
@ -48,21 +55,24 @@ fi
# Configure Pathogen Plugins # Configure Pathogen Plugins
VIM_BUNDLE=$HOME/.vim/bundle VIM_BUNDLE=$HOME/.vim/bundle
# Make the bundle directory and it's parents if they don't exist
mkdir -p $VIM_BUNDLE mkdir -p $VIM_BUNDLE
plugins=($(ls -d $PWD/.vim/bundle/* | tr -s ' '))
echo "${plugins[@]}"
# A list of vim plugins that are submodules
plugins=($(ls -d $DOTFILES_HOME/.vim/bundle/* | tr -s ' '))
#echo "${plugins[@]}"
# Loop through all of the plugins and install them as links in the bundle directory
for plugin in ${plugins[@]}; do for plugin in ${plugins[@]}; do
parts=($(echo "$plugin" | tr '/' ' ')) parts=($(echo "$plugin" | tr '/' ' '))
plugin_name=${parts[-1]} plugin_name=${parts[-1]}
echo "$VIM_BUNDLE $plugin_name $plugin"
#echo "$VIM_BUNDLE $plugin_name $plugin"
link_dir $VIM_BUNDLE $plugin_name $plugin link_dir $VIM_BUNDLE $plugin_name $plugin
done done
# Configure .gitconfig # Configure .gitconfig
link "$HOME" ".gitconfig" "gitconfig"
link "$HOME" ".gitconfig" "$DOTFILES_HOME/.gitconfig"
# Configure .zshrc # Configure .zshrc
link "$HOME" ".zshrc" "zshrc"
link "$HOME" ".zshrc" "$DOTFILES_HOME/.zshrc"
# Create an auto updater for the dotfiles # Create an auto updater for the dotfiles
if [ ! -f "$HOME/.update_dotfiles.sh" ]; then if [ ! -f "$HOME/.update_dotfiles.sh" ]; then

1
scripts/installers/README

@ -0,0 +1 @@
The scripts in this directory are for configuring my new systems to a specific baseline state.
Loading…
Cancel
Save