From c23cb2d353a399129c52393d5e1dfe22ea8e9a78 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <e.litherlandsmith@icloud.com>
Date: Mon, 30 Jan 2023 22:44:10 +0000
Subject: [PATCH] Remove installers from Makefile, fix SSH re-linking

---
 Makefile | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 93e765ff..e4f163cd 100644
--- a/Makefile
+++ b/Makefile
@@ -15,24 +15,20 @@ BIN_ITEMS := $(wildcard bin/*)
 BIN_TARGETS := $(BIN_ITEMS:bin/%=$(LOCAL_BIN)/%)
 ZSH_ITEMS := $(wildcard *.zsh)
 ZSH_TARGETS := $(ZSH_ITEMS:%.zsh=$(ZSH_CUSTOM_DIR)/%.zsh)
-INSTALLER_ITEMS := $(wildcard installers/*)
-INSTALLER_TARGETS := $(INSTALLER_ITEMS:installers/%.sh=%)
 
 PACKER_REPO := https://github.com/wbthomason/packer.nvim
 PACKER_DIR := $(HOME)/.local/share/nvim/site/pack/packer/start/packer.nvim
 POWERLEVEL_REPO := https://github.com/romkatv/powerlevel10k.git
 POWERLEVEL_DIR := $(ZSH_CUSTOM_DIR)/themes/powerlevel10k
 
-.PHONY := all force clean config zsh nvim ssh git bin $(INSTALLER_TARGETS)
+.PHONY := config bin all clean zsh ssh
 
 config: $(CONFIG_TARGETS) $(SYSTEMD_TARGETS) zsh ssh
 
-bin: $(BIN_TARGETS) $(INSTALLER_TARGETS)
+bin: $(BIN_TARGETS)
 
 all: config bin
 
-force: clean all
-
 clean:
 	# pipx uninstall-all
 	for link in $(CONFIG_TARGETS); do rm "$$link"; done
@@ -43,7 +39,7 @@ clean:
 
 zsh: $(ZSH_DIR) $(ZSH_CUSTOM_DIR) $(POWERLEVEL_DIR) $(ZSH_TARGETS)
 
-ssh: $(HOME)/.ssh/config
+ssh: $(HOME)/.ssh/config $(HOME)/.ssh/sockets
 
 $(CONFIG_TARGETS): $(CONFIG_DIR)/%: config/%
 $(SYSTEMD_TARGETS): $(SYSTEMD_DIR)/%: systemd/%
@@ -55,10 +51,7 @@ $(CONFIG_TARGETS) $(SYSTEMD_TARGETS) $(FONT_TARGETS) $(ZSH_TARGETS):
 $(BIN_TARGETS): $(LOCAL_BIN)/%: bin/%
 	command -v $? 2> /dev/null || ln -s $(PWD)$? $@
 
-$(INSTALLER_TARGETS): $(LOCAL_BIN)
-	./installers/$@.sh
-
-$(HOME)/.ssh/config: $(HOME)/.ssh $(HOME)/.ssh/sockets
+$(HOME)/.ssh/config: $(HOME)/.ssh
 	cp -n templates/ssh-config $@
 	touch $@