From ca247db5b24651b358f04cacc94a9b075fff7011 Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Tue, 31 Jan 2023 08:35:35 +0000 Subject: [PATCH] Remove systemd linking --- Makefile | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index e4f163cd..38f31f04 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,11 @@ LOCAL_BIN := $(HOME)/.local/bin CONFIG_DIR := $(if $(XDG_CONFIG_HOME), $(XDG_CONFIG_HOME), $(HOME)/.config) -SYSTEMD_DIR := $(CONFIG_DIR)/systemd/user FONT_DIR := $(HOME)/.local/share/fonts ZSH_DIR := $(if $(ZSH), $(ZSH), $(HOME)/.oh-my-zsh) ZSH_CUSTOM_DIR := $(if $(ZSH_CUSTOM), $(ZSH_CUSTOM), $(ZSH_DIR)/custom) CONFIG_ITEMS := $(wildcard config/*) CONFIG_TARGETS := $(CONFIG_ITEMS:config/%=$(CONFIG_DIR)/%) -SYSTEMD_ITEMS := $(wildcard systemd/*) -SYSTEMD_TARGETS := $(SYSTEMD_ITEMS:systemd/%=$(SYSTEMD_DIR)/%) FONT_ITEMS := $(wildcard nerdfont_symbols/*) FONT_TARGETS := $(FONT_ITEMS:nerdfont_symbols/%=$(FONT_DIR)/%) BIN_ITEMS := $(wildcard bin/*) @@ -23,7 +20,7 @@ POWERLEVEL_DIR := $(ZSH_CUSTOM_DIR)/themes/powerlevel10k .PHONY := config bin all clean zsh ssh -config: $(CONFIG_TARGETS) $(SYSTEMD_TARGETS) zsh ssh +config: $(CONFIG_TARGETS) zsh ssh bin: $(BIN_TARGETS) @@ -32,7 +29,6 @@ all: config bin clean: # pipx uninstall-all for link in $(CONFIG_TARGETS); do rm "$$link"; done - for link in $(SYSTEMD_TARGETS); do rm "$$link"; done for link in $(FONT_TARGETS); do rm "$$link"; done for link in $(BIN_TARGETS); do rm "$$link"; done for link in $(ZSH_TARGETS); do rm "$$link"; done @@ -42,10 +38,9 @@ zsh: $(ZSH_DIR) $(ZSH_CUSTOM_DIR) $(POWERLEVEL_DIR) $(ZSH_TARGETS) ssh: $(HOME)/.ssh/config $(HOME)/.ssh/sockets $(CONFIG_TARGETS): $(CONFIG_DIR)/%: config/% -$(SYSTEMD_TARGETS): $(SYSTEMD_DIR)/%: systemd/% $(FONT_TARGETS): $(FONT_DIR)/%: nerdfont_symbols/% $(ZSH_TARGETS): $(ZSH_CUSTOM_DIR)/%.zsh: %.zsh -$(CONFIG_TARGETS) $(SYSTEMD_TARGETS) $(FONT_TARGETS) $(ZSH_TARGETS): +$(CONFIG_TARGETS) $(FONT_TARGETS) $(ZSH_TARGETS): ln -s $(PWD)/$? $@ $(BIN_TARGETS): $(LOCAL_BIN)/%: bin/% @@ -69,5 +64,5 @@ $(POWERLEVEL_DIR): $(HOME)/.gitconfig: touch $@ -$(LOCAL_BIN) $(CONFIG_DIR) $(SYSTEMD_DIR) $(FONT_DIR) $(HOME)/.ssh $(HOME)/.ssh/sockets: +$(LOCAL_BIN) $(CONFIG_DIR) $(FONT_DIR) $(HOME)/.ssh $(HOME)/.ssh/sockets: mkdir -p $@