Merge branch 'master' into cas

1 files changed, 28 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index 12854c4..1c66195 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,17 @@
 VIM := $(shell command -v vim 2>/dev/null)
+BCONFS := bash/.bash_logout bash/.bashrc
 ZCONFS := zsh/zshenv zsh/zshrc
 SCONFS := sh/profile
 DCONFS := doas.conf
 
 all:
 
-install: install-hyprplugins install-zshconfigs install-shconfigs vimplug-vim
+install: install-zshconfigs install-shconfigs vimplug-vim wc
+
+wc:
+	@echo "Installing wayland compositor stuff..."
+	@./installers/wc
+	@echo "Done."
 
 install-hyprplugins: install-hyprsplit install-hyprland-plugins
 
@@ -23,12 +29,26 @@ install-hyprland-plugins:
 	@hyprpm enable hyprscrolling
 	@echo "Done."
 
-install-zshconfigs: $(ZCONFS)
-	@echo "Installing zsh conf files..."
-	@echo ".zshenv..."
-	@ln -sf `pwd`/zsh/zshenv ~/.zshenv
-	@echo ".zshrc..."
-	@ln -sf `pwd`/zsh/zshrc ~/.zshrc
+install-scrollconf: scroll/config.d/user.conf
+
+scroll/config.d/user.conf:
+	@echo "Generating user.conf..."
+	@mkdir -p scroll/config.d
+	@echo 'set $$home' $(shell echo $(HOME)) > scroll/config.d/user.conf
+	@echo "Done."
+
+install-bashconfigs: $(BCONFS) install-shconfigs
+	@echo "Installing bash conf files..."
+	@echo ".bashrc..."
+	@ln -sf `pwd`/bash/.bashrc ~/.bashrc
+	@echo ".bash_logout..."
+	@ln -sf `pwd`/bash/.bash_logout ~/.bash_logout
+	@echo "Done."
+
+install-zshconfigs: install-shconfigs
+	@echo "Settings up ZDOTDIR..."
+	@echo "Installing .zprofile..."
+	@ln -sf `pwd`/sh/profile ~/.zprofile
 	@echo "Done."
 
 install-shconfigs: $(SCONFS)
@@ -51,4 +71,4 @@ doas-conf: $(DCONFS)
 	@sudo cp -n doas.conf /etc/doas.conf
 	@echo "Done."
 
-.PHONY: install-hyprplugins install-zshconfigs install-shconfigs vimplug-vim doas-conf install
+.PHONY: install-hyprplugins install-zshconfigs install-shconfigs vimplug-vim doas-conf install install-scrollconf install-bashconfigs