From c2bcdb1197512c8b30a98120df402ff432ef60b3 Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Fri, 27 Jan 2023 19:36:54 +0000 Subject: [PATCH] Fix zsh targets, add to all --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 884c144f..a2b17435 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ FONT_TARGETS := $(FONT_ITEMS:nerdfont_symbols/%=$(FONT_DIR)/%) BIN_ITEMS := $(wildcard bin/*) BIN_TARGETS := $(BIN_ITEMS:bin/%=$(LOCAL_BIN)/%) ZSH_ITEMS := $(wildcard *.zsh) -ZSH_TARGETS := $(ZSH_ITEMS:%.zsh=$(ZSH_CUSTOM_DIR)/custom/%.zsh) +ZSH_TARGETS := $(ZSH_ITEMS:%.zsh=$(ZSH_CUSTOM_DIR)/%.zsh) PACKER_REPO := https://github.com/wbthomason/packer.nvim PACKER_DIR := $(HOME)/.local/share/nvim/site/pack/packer/start/packer.nvim @@ -34,10 +34,13 @@ config: $(CONFIG_TARGETS) $(SYSTEMD_TARGETS) $(FONT_TARGETS) bin: $(BIN_TARGETS) $(PACKER_DIR) +zsh: $(ZSH_DIR) $(ZSH_CUSTOM_DIR) $(POWERLEVEL_DIR) $(ZSH_TARGETS) + $(CONFIG_TARGETS): $(CONFIG_DIR)/%: config/% $(SYSTEMD_TARGETS): $(SYSTEMD_DIR)/%: systemd/% $(FONT_TARGETS): $(FONT_DIR)/%: nerdfont_symbols/% -$(CONFIG_TARGETS) $(SYSTEMD_TARGETS) $(FONT_TARGETS): +$(ZSH_TARGETS): $(ZSH_CUSTOM_DIR)/%.zsh: %.zsh +$(CONFIG_TARGETS) $(SYSTEMD_TARGETS) $(FONT_TARGETS) $(ZSH_TARGETS): ln -s $(PWD)/$? $@ $(BIN_TARGETS): $(LOCAL_BIN)/%: bin/% @@ -54,12 +57,9 @@ $(ZSH_DIR): $(ZSH_CUSTOM_DIR): $(ZSH_DIR) -$(POWERLEVEL_DIR): $(ZSH_CUSTOM_DIR) +$(POWERLEVEL_DIR): git clone --depth 1 $(POWERLEVEL_REPO) $@ -$(ZSH_TARGETS): $(ZSH_CUSTOM_DIR)/%.zsh: %.zsh - ln -s $(PWD)/$? $@ - $(HOME)/.gitconfig: grep "editor" $@ > /dev/null || git config --global core.editor "nvim" grep "pull.rebase" $@ > /dev/null || git config --global pull.rebase false