aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorPeter Son Struschka <me@peter-struschka.com>2020-02-02 12:58:59 +0800
committerPeter Son Struschka <me@peter-struschka.com>2020-02-02 12:58:59 +0800
commit4e33b8e8a196d1d81485dc3f523d9cf0bbdb2f49 (patch)
treebfe55e66734928054a28a0ad1def7f43a2538970 /Makefile
parentf2b18aab5a84d04a36f4194473680ad70bdb5578 (diff)
parentde79e53a021ae10065886f6360de62bd7c65b605 (diff)
downloaddotfiles-4e33b8e8a196d1d81485dc3f523d9cf0bbdb2f49.tar.gz
dotfiles-4e33b8e8a196d1d81485dc3f523d9cf0bbdb2f49.tar.bz2
dotfiles-4e33b8e8a196d1d81485dc3f523d9cf0bbdb2f49.tar.lz
dotfiles-4e33b8e8a196d1d81485dc3f523d9cf0bbdb2f49.tar.xz
dotfiles-4e33b8e8a196d1d81485dc3f523d9cf0bbdb2f49.tar.zst
dotfiles-4e33b8e8a196d1d81485dc3f523d9cf0bbdb2f49.zip
fix merge conflict
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index e9ff619..31bfcef 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
all_files := basics emacs spacemacs doom-emacs git i3wm bspwm vim nvim tmux x zsh fish
-simple_files := emacs spacemacs doom-emacs vim x zsh fish
+simple_files := emacs spacemacs doom-emacs vim x fish
-.PHONY: $(all_files)
+.PHONY: $(all_files) zplug
$(simple_files):
@@ -36,7 +36,11 @@ nvim:
curl -fLo nvim/.config/nvim/autoload/plug.vim --create-dirs \
https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
stow -t ~ $@
+zsh: zplug
+ stow -t ~ $@
+zplug:
+ curl -sL --proto-redir -all,https https://raw.githubusercontent.com/zplug/installer/master/installer.zsh | zsh