From 373441fde1ddd2b915cc83e5a43c87fef566b101 Mon Sep 17 00:00:00 2001 From: ZachIR Date: Sat, 26 Jul 2025 11:24:47 -0500 Subject: Add initial bash configs --- Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 12854c4..a25e316 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ 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 @@ -9,6 +10,14 @@ install: install-hyprplugins install-zshconfigs install-shconfigs vimplug-vim install-hyprplugins: install-hyprsplit install-hyprland-plugins +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-hyprsplit: @echo "Installing hyprsplit..." @hyprpm add https://github.com/shezdy/hyprsplit || echo "Already installed!" -- cgit v1.2.3 From 82506e32c7233cadca8249fb60e28b5e0e13aa2d Mon Sep 17 00:00:00 2001 From: ZachIR Date: Sat, 26 Jul 2025 11:25:02 -0500 Subject: ZSH make install only needs to setup .zprofile --- Makefile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a25e316..ac56da3 100644 --- a/Makefile +++ b/Makefile @@ -32,12 +32,10 @@ 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-zshconfigs: install-shconfigs + @echo "Settings up ZDOTDIR..." + @echo "Installing .zprofile..." + @ln -sf `pwd`/sh/profile ~/.zprofile @echo "Done." install-shconfigs: $(SCONFS) -- cgit v1.2.3 From ac700e2efa3479460b565d1542725da3c2c6c68c Mon Sep 17 00:00:00 2001 From: ZachIR Date: Sat, 26 Jul 2025 12:56:35 -0500 Subject: Add $home variable for scroll --- .gitignore | 1 + Makefile | 14 ++++++++++++-- scroll/config | 2 ++ 3 files changed, 15 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/.gitignore b/.gitignore index 3dcf353..6bd8fea 100644 --- a/.gitignore +++ b/.gitignore @@ -237,6 +237,7 @@ RVXX EXEX.settings RVXX v2/ RVXX v2.settings SchildiChat/ +scroll/user.conf Serenity/ Session/ Shibalba EXEX.settings diff --git a/Makefile b/Makefile index ac56da3..3f6f51c 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ DCONFS := doas.conf all: -install: install-hyprplugins install-zshconfigs install-shconfigs vimplug-vim +install: install-hyprplugins install-zshconfigs install-shconfigs vimplug-vim install-scrollconf install-hyprplugins: install-hyprsplit install-hyprland-plugins @@ -32,6 +32,16 @@ install-hyprland-plugins: @hyprpm enable hyprscrolling @echo "Done." +install-scrollconf: scroll/user.conf + @echo "Installing user.conf..." + @sudo ln -sf `pwd`/scroll/user.conf /etc/scroll/config.d/user.conf + @echo "Done." + +scroll/user.conf: + @echo "Generating user.conf..." + @echo 'set $$home' $(shell echo $(HOME)) > scroll/user.conf + @echo "Done." + install-zshconfigs: install-shconfigs @echo "Settings up ZDOTDIR..." @echo "Installing .zprofile..." @@ -58,4 +68,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 diff --git a/scroll/config b/scroll/config index c715eed..e1b0f0e 100644 --- a/scroll/config +++ b/scroll/config @@ -6,6 +6,8 @@ # # Read `man 5 scroll` for a complete reference. +include /etc/scroll/config.d/* + ### Variables # # Logo key. Use Mod1 for Alt. -- cgit v1.2.3 From 85559e966fd1e29374c759c697ac9c5757750d3c Mon Sep 17 00:00:00 2001 From: ZachIR Date: Sat, 26 Jul 2025 12:56:55 -0500 Subject: Move bash in Makefile and make it phony --- Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3f6f51c..ce4171e 100644 --- a/Makefile +++ b/Makefile @@ -10,14 +10,6 @@ install: install-hyprplugins install-zshconfigs install-shconfigs vimplug-vim in install-hyprplugins: install-hyprsplit install-hyprland-plugins -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-hyprsplit: @echo "Installing hyprsplit..." @hyprpm add https://github.com/shezdy/hyprsplit || echo "Already installed!" @@ -42,6 +34,14 @@ scroll/user.conf: @echo 'set $$home' $(shell echo $(HOME)) > scroll/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..." @@ -68,4 +68,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 install-scrollconf +.PHONY: install-hyprplugins install-zshconfigs install-shconfigs vimplug-vim doas-conf install install-scrollconf install-bashconfigs -- cgit v1.2.3 From 304aa0bc4856e5498b64ae95e73e1a7b21924f46 Mon Sep 17 00:00:00 2001 From: ZachIR Date: Sat, 26 Jul 2025 13:07:11 -0500 Subject: Add wc script to install wc stuff as necessary --- Makefile | 7 ++++++- installers/wc | 6 ++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100755 installers/wc (limited to 'Makefile') diff --git a/Makefile b/Makefile index ce4171e..24b5acd 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,12 @@ DCONFS := doas.conf all: -install: install-hyprplugins install-zshconfigs install-shconfigs vimplug-vim install-scrollconf +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 diff --git a/installers/wc b/installers/wc new file mode 100755 index 0000000..bfdb299 --- /dev/null +++ b/installers/wc @@ -0,0 +1,6 @@ +#!/bin/sh + +pgrep -x Hyprland && make install-hyprplugins +pgrep -x scroll && make install-scrollconf + + -- cgit v1.2.3