From d0e3bd71a4b3ec9bd2081c2c2616f6b374d4b228 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Pankowski?= <lukpank@o2.pl>
Date: Sat, 11 Oct 2025 10:11:32 +0200
Subject: [PATCH] merge yash into shell, Makefile: update dwm, st and other
 instalation

---
 Makefile                             | 17 +++++++++++------
 {yash => shell}/.config/yash/profile |  0
 {yash => shell}/.config/yash/rc      |  0
 3 files changed, 11 insertions(+), 6 deletions(-)
 rename {yash => shell}/.config/yash/profile (100%)
 rename {yash => shell}/.config/yash/rc (100%)

diff --git a/Makefile b/Makefile
index d8bbe81..a7f9108 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 all: 
 	@echo "run: make clone build install"
 
-clone: ~/.local/share/zap dwm st
+clone: dwm st
 
 build: build-dwm build-st build-lupan-clock
 
@@ -14,7 +14,10 @@ install: install-dwm install-st install-lupan-clock install-other
 
 dwm:
 	git clone https://git.suckless.org/dwm 
-	cp -i patches/dwm/config.h dwm/
+	cd dwm && \
+		git remote add lupan.pl https://gitea.lupan.pl/lupan/dwm.git && \
+		git fetch lupan.pl && \
+		git checkout -b wip --track lupan.pl/wip
 
 build-dwm:
 	make -C dwm
@@ -27,19 +30,21 @@ st:
 	cd st && \
 		git remote add lupan.pl https://gitea.lupan.pl/lupan/st.git && \
 		git fetch lupan.pl && \
-		git checkout -b patched --track lupan.pl/patched
+		git checkout -b patched-4 --track lupan.pl/patched-4
 
 build-st:
 	make -C st
 
 install-st:
-	make -C st install PREFIX="${HOME}/.local"
+	make -C st install PREFIX="${HOME}/.local/stow/st"
+	stow -d ~/.local/stow st
 
 build-lupan-clock:
 	make -C lupan-clock
 
 install-lupan-clock:
-	make -C lupan-clock install PREFIX="${HOME}/.local"
+	make -C lupan-clock install PREFIX="${HOME}/.local/stow/dwm"
+	stow -d ~/.local/stow dwm
 
 install-other:
-	stow -Rv shell tmux xsession nvim
+	stow -Rv lazygit shell tmux vis xsession
diff --git a/yash/.config/yash/profile b/shell/.config/yash/profile
similarity index 100%
rename from yash/.config/yash/profile
rename to shell/.config/yash/profile
diff --git a/yash/.config/yash/rc b/shell/.config/yash/rc
similarity index 100%
rename from yash/.config/yash/rc
rename to shell/.config/yash/rc