Merge remote-tracking branch 'origin/master' into cla

1 files changed, 3 insertions, 15 deletions

diff --git a/Makefile b/Makefile
index 0faf846..e27af0a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,28 +1,16 @@
 VIM := $(shell command -v vim 2>/dev/null)
 NVIM := $(shell command -v nvim 2>/dev/null)
-XCONFS := X11/Xresources
 ZCONFS := zsh/.zshenv
-SCONFS := sh/profile
 DCONFS := doas.conf
 
 all:
 
-install: install-xconfigs install-shconfigs install-zshconfigs vimplug-vim vimplug-nvim
-
-install-xconfigs: $(XCONFS)
-	@echo "Installing Xorg conf files..."
-	@echo "Xresources..."
-	@ln -sf `pwd`/X11/Xresources ~/.Xresources
-	@echo "Done."
-
-install-shconfigs: $(SCONFS)
-	@echo "Installing SH conf files..."
-	@echo ".profile..."
-	@ln -sf `pwd`/sh/profile ~/.profile
-	@echo "Done."
+install: install-zshconfigs vimplug-vim vimplug-nvim
 
 install-zshconfigs: $(ZCONFS)
 	@echo "Installing zsh conf files..."
+	@echo "Setting ZSHDOTDIR globally..."
+	@$(shell sudo installers/set_zshdirs.sh)
 	@echo ".zshenv..."
 	@ln -sf `pwd`/zsh/.zshenv ~/.zshenv
 	@echo "Done."