Merge branch 'master' into rai-master

1 files changed, 51 insertions, 14 deletions

diff --git a/Makefile b/Makefile
index dedeb57..f918e93 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,54 @@
 VIM := $(shell command -v vim 2>/dev/null)
-NVIM := $(shell command -v nvim 2>/dev/null)
-ZCONFS := zsh/.zshenv
+BCONFS := bash/.bash_logout bash/.bashrc
+ZCONFS := zsh/zshenv zsh/zshrc
 SCONFS := sh/profile
+DCONFS := doas.conf
 
 all:
 
-install: install-zshconfigs install-shconfigs vimplug-vim vimplug-nvim
+install: install-zshconfigs install-shconfigs vimplug-vim wc
 
-install-zshconfigs: $(ZCONFS)
-	@echo "Installing zsh conf files..."
-	@echo ".zshenv..."
-	@ln -sf `pwd`/zsh/.zshenv ~/.zshenv
+wc:
+	@echo "Installing wayland compositor stuff..."
+	@./installers/wc
+	@echo "Done."
+
+install-hyprplugins: install-hyprsplit install-hyprland-plugins
+
+install-hyprsplit:
+	@echo "Installing hyprsplit..."
+	@hyprpm add https://github.com/shezdy/hyprsplit || echo "Already installed!"
+	@echo "Enabling hyprsplit..."
+	@hyprpm enable hyprsplit
+	@echo "Done."
+
+install-hyprland-plugins:
+	@echo "Installing hyprland-plugins..."
+	@hyprpm add https://github.com/hyprwm/hyprland-plugins || echo "Already installed!"
+	@echo "Enabling hyprscrolling..."
+	@hyprpm enable hyprscrolling
+	@echo "Done."
+
+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)
@@ -28,11 +66,10 @@ else
 	@echo "vim not installed."
 endif
 
-vimplug-nvim: installers/vimplug_nvim.sh
-ifdef NVIM
-	@echo "Installing vim-plug for nvim..."
-	@$(shell installers/vimplug_nvim.sh)
+doas-conf: $(DCONFS)
+	@echo "Installing doas config files..."
+	@echo "doas.conf..."
+	@sudo cp -n doas.conf /etc/doas.conf
 	@echo "Done."
-else
-	@echo "nvim not installed."
-endif
+
+.PHONY: install-hyprplugins install-zshconfigs install-shconfigs vimplug-vim doas-conf install install-scrollconf install-bashconfigs