pixelifytica/nixos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix zsh targets, add to all

Browse source
This commit is contained in:
Evie Litherland-Smith 2023-01-27 19:36:54 +00:00
parent 7657963b58
commit 9fba7d84d6
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Makefile
View file

@ -14,7 +14,7 @@ FONT_TARGETS := $(FONT_ITEMS:nerdfont_symbols/%=$(FONT_DIR)/%)
BIN_ITEMS := $(wildcard bin/*) BIN_ITEMS := $(wildcard bin/*)
BIN_TARGETS := $(BIN_ITEMS:bin/%=$(LOCAL_BIN)/%) BIN_TARGETS := $(BIN_ITEMS:bin/%=$(LOCAL_BIN)/%)
ZSH_ITEMS := $(wildcard *.zsh) 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_REPO := https://github.com/wbthomason/packer.nvim
PACKER_DIR := $(HOME)/.local/share/nvim/site/pack/packer/start/packer.nvim PACKER_DIR := $(HOME)/.local/share/nvim/site/pack/packer/start/packer.nvim
@ -34,9 +34,12 @@ config: $(CONFIG_TARGETS) $(SYSTEMD_TARGETS) $(FONT_TARGETS)
bin: $(BIN_TARGETS) $(PACKER_DIR) bin: $(BIN_TARGETS) $(PACKER_DIR)
zsh: $(ZSH_DIR) $(ZSH_CUSTOM_DIR) $(POWERLEVEL_DIR) $(ZSH_TARGETS)
$(CONFIG_TARGETS): $(CONFIG_DIR)/%: config/% $(CONFIG_TARGETS): $(CONFIG_DIR)/%: config/%
$(SYSTEMD_TARGETS): $(SYSTEMD_DIR)/%: systemd/% $(SYSTEMD_TARGETS): $(SYSTEMD_DIR)/%: systemd/%
$(FONT_TARGETS): $(FONT_DIR)/%: nerdfont_symbols/% $(FONT_TARGETS): $(FONT_DIR)/%: nerdfont_symbols/%
$(ZSH_TARGETS): $(ZSH_CUSTOM_DIR)/%.zsh: %.zsh
$(CONFIG_TARGETS) $(SYSTEMD_TARGETS) $(FONT_TARGETS): $(CONFIG_TARGETS) $(SYSTEMD_TARGETS) $(FONT_TARGETS):
ln -s $(PWD)/$? $@ ln -s $(PWD)/$? $@
@ -54,12 +57,9 @@ $(ZSH_DIR):
$(ZSH_CUSTOM_DIR): $(ZSH_DIR) $(ZSH_CUSTOM_DIR): $(ZSH_DIR)
$(POWERLEVEL_DIR): $(ZSH_CUSTOM_DIR) $(POWERLEVEL_DIR):
git clone --depth 1 $(POWERLEVEL_REPO) $@ git clone --depth 1 $(POWERLEVEL_REPO) $@
$(ZSH_TARGETS): $(ZSH_CUSTOM_DIR)/%.zsh: %.zsh
ln -s $(PWD)/$? $@
$(HOME)/.gitconfig: $(HOME)/.gitconfig:
grep "editor" $@ > /dev/null || git config --global core.editor "nvim" grep "editor" $@ > /dev/null || git config --global core.editor "nvim"
grep "pull.rebase" $@ > /dev/null || git config --global pull.rebase false grep "pull.rebase" $@ > /dev/null || git config --global pull.rebase false