From 3135e5faf23f83900d16bfd465b4442d51e36377 Mon Sep 17 00:00:00 2001 From: William Carroll Date: Wed, 25 Apr 2018 13:35:55 -0400 Subject: [PATCH] Refactor install scripts - Support emacs installation - Export DOTFILES env var to simplify setup. - Change filenames for consistency --- bins/{setup_bins.sh => setup} | 0 configs/{setup_configs.sh => setup} | 0 configs/shared/.zshrc | 1 + emacs.d/projectile-bookmarks.eld | 1 - install.sh | 10 +++------- 5 files changed, 4 insertions(+), 8 deletions(-) rename bins/{setup_bins.sh => setup} (100%) rename configs/{setup_configs.sh => setup} (100%) delete mode 100644 emacs.d/projectile-bookmarks.eld diff --git a/bins/setup_bins.sh b/bins/setup similarity index 100% rename from bins/setup_bins.sh rename to bins/setup diff --git a/configs/setup_configs.sh b/configs/setup similarity index 100% rename from configs/setup_configs.sh rename to configs/setup diff --git a/configs/shared/.zshrc b/configs/shared/.zshrc index 370a9fa94..79832255e 100644 --- a/configs/shared/.zshrc +++ b/configs/shared/.zshrc @@ -1,4 +1,5 @@ export META_DIR="${HOME}/urbint/meta" +export DOTFILES="${HOME}/dotfiles" export ZSH="${HOME}/.oh-my-zsh" ZSH_THEME=refined diff --git a/emacs.d/projectile-bookmarks.eld b/emacs.d/projectile-bookmarks.eld deleted file mode 100644 index d42f6e551..000000000 --- a/emacs.d/projectile-bookmarks.eld +++ /dev/null @@ -1 +0,0 @@ -("~/urbint/meta/" "~/urbint/grid-front-end/" "~/dotfiles/" "~/urbint/evil-text-objects-javascript/" "~/pc_settings/" "~/programming/doom-emacs/" "~/urbint/evil-text-objects-haskell/" "~/urbint/grid/" "~/urbint/machina/" "~/urbint/grid-front-end-reasonml/" "~/urbint/docker-images/" "~/programming/cryptocurrency/" "~/programming/a-reason-react-tutorial/") \ No newline at end of file diff --git a/install.sh b/install.sh index 44a1829a5..b92d4118f 100644 --- a/install.sh +++ b/install.sh @@ -1,9 +1,5 @@ #!/usr/bin/env zsh - -# install custom bin/ executables to $HOME/bin -source "${HOME}/dotfiles/bins/setup_bins.sh" - - -# symlink config files -source "${HOME}/dotfiles/configs/setup_configs.sh" +source "${DOTFILES}/bins/setup" +source "${DOTFILES}/configs/setup" +ln -s "${DOTFILES}/emacs.d" "${HOME}/.emacs.d"