dotless

commit c8a7ec3cfe39d88d3aead5422d905f93a95e6cf4
parent 4863c13096777e4d21b4896d4b32254cb634304b
Author: cowmonk <cowmonk@based.pt>
Date:   Fri, 29 May 2026 18:33:13 +0000

update links

Diffstat:
M
Makefile
 | 
48
++++++++++++++++++++++++++++++++++--------------
M
README
 | 
21
++++++++++++++++++++-

2 files changed, 54 insertions(+), 15 deletions(-)
diff --git a/Makefile b/Makefile
@@ -5,7 +5,11 @@
 #
 
 .POSIX:
-SHELL   = /bin/sh
+SHELL = /bin/sh
+
+USRFILE  = .user
+USR      = $(shell tr -d '\n' < $(USRFILE) 2>/dev/null)
+HOME_DIR = $(shell awk -F: -v u="$(USR)" '$$1==u{print $$6}' /etc/passwd)
 
 include config.mk
 
@@ -53,26 +57,42 @@ pull: $(SRCDIR)/$(NAME_dwm).tar.gz $(SRCDIR)/$(NAME_st).tar.gz $(SRCDIR)/$(NAME_
 extract: pull $(EXTDIR)/$(NAME_dwm) $(EXTDIR)/$(NAME_st) $(EXTDIR)/$(NAME_dmenu) $(EXTDIR)/$(NAME_slstatus)
 	@printf "\033[1mextracted all sources!\n\033[0m"
 
-build: extract
-	@$(MAKE) -C $(EXTDIR)/$(NAME_dwm) CC="$(CC)"
-	@$(MAKE) -C $(EXTDIR)/$(NAME_st) CC="$(CC)"
-	@$(MAKE) -C $(EXTDIR)/$(NAME_dmenu) CC="$(CC)"
-	@$(MAKE) -C $(EXTDIR)/$(NAME_slstatus) CC="$(CC)"
+.user:
+	@sh -c "echo $(whoami) > .user"
+
+build: extract .user
+	@if [ ${NOUSR} -eq 1 ] && [ ${BSD} -eq 0 ]; then \
+		find $(EXTDIR) -name config.mk -exec sed -i 's|/usr/|/|g' {} +; \
+	elif []
+	fi
+	@(cd $(EXTDIR)/$(NAME_dwm)      && CC="$(CC)" $(MAKE))
+	@(cd $(EXTDIR)/$(NAME_st)       && CC="$(CC)" $(MAKE))
+	@(cd $(EXTDIR)/$(NAME_dmenu)    && CC="$(CC)" $(MAKE))
+	@(cd $(EXTDIR)/$(NAME_slstatus) && CC="$(CC)" $(MAKE))
 	
 install: build
-	@$(MAKE) -C $(EXTDIR)/$(NAME_dwm) CC="$(CC)" PREFIX="$(PREFIX)"
-	@$(MAKE) -C $(EXTDIR)/$(NAME_st) CC="$(CC)" PREFIX="$(PREFIX)"
-	@$(MAKE) -C $(EXTDIR)/$(NAME_dmenu) CC="$(CC)" PREFIX="$(PREFIX)"
-	@$(MAKE) -C $(EXTDIR)/$(NAME_slstatus) CC="$(CC)" PREFIX="$(PREFIX)"
+	#@(cd $(EXTDIR)/$(NAME_dwm)      && CC="$(CC)" PREFIX="$(PREFIX)" $(MAKE) install)
+	#@(cd $(EXTDIR)/$(NAME_st)       && CC="$(CC)" PREFIX="$(PREFIX)" $(MAKE) install)
+	#@(cd $(EXTDIR)/$(NAME_dmenu)    && CC="$(CC)" PREFIX="$(PREFIX)" $(MAKE) install)
+	#@(cd $(EXTDIR)/$(NAME_slstatus) && CC="$(CC)" PREFIX="$(PREFIX)" $(MAKE) install)
+	@if [ ${YASH} -eq 1 ]; then \
+		#install -d -m 0755 "$(HOME_DIR)/.config/yash"; \
+		#cp -av $(TOP)/files/config/yash/* $(HOME_DIR)/.config/yash/; \
+		#chown -R $(USR):$(USR) $(HOME_DIR)/.config/;
+		echo $(USR)
+		echo $(HOME_DIR)
+	fi
 
 clean: build
-	@$(MAKE) -C $(EXTDIR)/$(NAME_dwm) clean CC="$(CC)"
-	@$(MAKE) -C $(EXTDIR)/$(NAME_st) clean CC="$(CC)"
-	@$(MAKE) -C $(EXTDIR)/$(NAME_dmenu) clean CC="$(CC)"
-	@$(MAKE) -C $(EXTDIR)/$(NAME_slstatus) clean CC="$(CC)"
+	@(cd $(EXTDIR)/$(NAME_dwm)      && CC="$(CC)" $(MAKE) clean)
+	@(cd $(EXTDIR)/$(NAME_st)       && CC="$(CC)" $(MAKE) clean)
+	@(cd $(EXTDIR)/$(NAME_dmenu)    && CC="$(CC)" $(MAKE) clean)
+	@(cd $(EXTDIR)/$(NAME_slstatus) && CC="$(CC)" $(MAKE) clean)
 
 distclean: clean
 	@echo "cleaning $(SRCDIR)"
 	@rm -r "$(SRCDIR)"
 	@echo "cleaning $(EXTDIR)"
 	@rm -r "$(EXTDIR)"
+	@echo "removing .user"
+	@rm .user
diff --git a/README b/README
@@ -42,9 +42,28 @@ $ doas make PREFIX=/usr/local LAPTOP=1 BSD=1 YASH=1 install # yes, I prefer open
 Patches
 -------
 
-Sending patches is trivial, the main site of development is on the [stagit repo](https://git.based.pt/dotless.git).
+Sending patches is trivial, the main site of development is on the [stagit repo](https://based.pt/~cowmonk/git/dotless/log.html).
 This means that all patches aren't sent via PRs on any of the mirrors.
 
 Run a quick `git format-patch HEAD~1` and send to *cowmonk@based.pt* with the subject head of `[PATCH] dotless`.
 Consider reading the manpages of `git-send-email` if you are interested in moving towards email for development.
 
+I *strongly* suggest pgp encrypting your email, in which case my public keys can be found on `keys.openpgp.org`
+or here:
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: 52B0 852C 5A4C 823C FAB7  420A 2F73 9BCA BDD5 B880
+Comment: cowmonk@based.pt
+
+xjMEaSJi8xYJKwYBBAHaRw8BAQdAEVP64bLVXCxZYH5rItmtvThKyTrRZ4HFCZ42
+IqFx+crNEGNvd21vbmtAYmFzZWQucHTCiQQTFggAGgQLCQgHAhUIAhYBAhkABYJp
+ImLzAp4BApsDACEJEC9zm8q91biAFiEEUrCFLFpMgjz6t0IKL3Obyr3VuIBOEQEA
++gIa9t3yKL3FAHg5VT2xV8M2VdLf1ZqaFlCPyGhXBZsA+QGGstK6+YsUbmP+H6I5
+r4AgLawGeB9IH7WC0w4dhTsKzjgEaSJi8xIKKwYBBAGXVQEFAQEHQMsmen1ddl9a
+ddXu4ktm8BATTlEy2k4zMzo6RnyRB+d4AwEIB8J4BBgWCAAJBYJpImLzApsMACEJ
+EC9zm8q91biAFiEEUrCFLFpMgjz6t0IKL3Obyr3VuIA9AQD/S/EL51hMSBI35Lr3
+RjuNFtqnlgYpfkMxgPvp2bWRY60A/2NhDRNUjY2wA4+mESlCIf94FVvqcfclnSZU
+A7wM/YAB
+=nZZp
+-----END PGP PUBLIC KEY BLOCK-----
+