X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=Makefile;h=cfec937e5230e888584b599735d5673997130128;hb=7d4d7217bf0351568c95e7210bb37eab461b142e;hp=d2049439cc52dbf57c67806b7d5bfe2e8961b40f;hpb=32cd449ece4dce4fef1b569ec308f73a8c894fc0;p=khome.git

diff --git a/Makefile b/Makefile
index d204943..cfec937 100644
--- a/Makefile
+++ b/Makefile
@@ -3,9 +3,11 @@ MAKEFLAGS := --no-builtin-rules
 DEPS := $(wildcard deps/*)
 
 ifeq ($(shell uname),Darwin)
+	GREP := ggrep
 	SED := gsed
 	DIFF := $(shell gls -t1 /usr/local/Cellar/diffutils/*/bin/diff | head -1)
 else
+	GREP := grep
 	SED  := sed
 	DIFF := diff
 endif
@@ -19,6 +21,8 @@ endif
     diff \
     pull \
     mpdconf \
+    pkgs_void \
+    pkgs_void_update \
     pkgs_brew_cask_install \
     pkgs_brew_install \
     pkgs_cargo \
@@ -38,24 +42,19 @@ default:
 	@exit 1
 
 home: mpdconf compiled
-	@cp  -Rp       bin           $(HOME)/
-	@cp  -Rp  home/bin           $(HOME)/
-	@cp  -Rp  home/lib           $(HOME)/
-	@cp       home/.compton.conf $(HOME)/
-	@cp  -Rp  home/.config/      $(HOME)/
-	@cp  -Rp  home/.newsboat/    $(HOME)/
-	@cp       home/.profile      $(HOME)/
-	@cp       home/.fonts.conf   $(HOME)/
-	@cp       home/.Rprofile     $(HOME)/
-	@cp       home/.tmux.conf    $(HOME)/
-	@cp       home/.xbindkeysrc  $(HOME)/
+	cp -Rp bin $(HOME)/
+	# Limit depth because directories are copied recursively:
+	find home -maxdepth 1 -print0 \
+	| $(GREP) -zv '^home$$' \
+	| xargs -0 -I% cp -Rp % ~
+	xdg-user-dirs-update
 
 mpdconf:
-	@mkdir -p ~/Archives/Audio
-	@mkdir -p ~/var/lib/mpd/playlists
-	@mkdir -p ~/var/log/mpd
-	@mkdir -p ~/var/run/mpd
-	@cp home/.mpdconf $(HOME)/
+	mkdir -p ~/arc/aud
+	mkdir -p ~/var/lib/mpd/playlists
+	mkdir -p ~/var/log/mpd
+	mkdir -p ~/var/run/mpd
+	cp home/.mpdconf $(HOME)/
 
 compiled:
 	mkdir -p bin
@@ -63,13 +62,24 @@ compiled:
 	mv src/clockloop bin/
 
 font_cache:
-	@fc-cache -fv
+	fc-cache -fv
+
+#
+# Void Linux
+#
+
+pkgs_void:
+	sudo xbps-install $(shell ./list pkgs-void.list)
+
+pkgs_void_update:
+	xbps-query -m | awk -F - '{sub("-" $$NF "$$", ""); print}' | sort -u > pkgs-void.list
+	(echo '#'; ./patch-comments pkgs-void.list.comments pkgs-void.list) | sponge pkgs-void.list
 
 #
 # Golang
 #
 pkgs_golang: list pkgs-golang.list
-	go get $(shell ./list pkgs-golang.list)
+	go get -u $(shell ./list pkgs-golang.list)
 
 #
 # Ubuntu
@@ -84,10 +94,10 @@ pkgs_ubuntu_debfiles: list pkgs-ubuntu-debfiles.list
 # PIP
 #
 pkgs_pip_install:
-	pip3 install --user $(shell ./list pkgs-pip.list)
+	pip install --user $(shell ./list pkgs-pip.list)
 
 pkgs_pip_upgrade:
-	pip3 install --user --upgrade $(shell ./list pkgs-pip.list)
+	pip install --user --upgrade $(shell ./list pkgs-pip.list)
 
 #
 # Rust (cargo)
@@ -150,7 +160,7 @@ $(foreach d,$(DEPS),$(eval $(call GEN_DEP_RULE,$(d))))
 diff:
 	find home -type f -print0 \
 	| $(SED) -z 's/^home\///g' \
-	| xargs -0 -I% sh -c 'echo %; $(DIFF) --color=always ~/% home/%'
+	| xargs -0 -I% sh -c 'echo %; $(DIFF) --color=auto ~/% home/%'
 
 pull:
 	find home -type f -print0 \