X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=Makefile;h=4e7ab3cb4938b5da353eedf22becca78c467b955;hb=b46a64f442cc630f90b2decd6c8fc8d24fda3a7d;hp=f8087cfbee2fb97a0263d14a5068f33330b8c30b;hpb=ca0c92b8b74a45bcfbf14198f3d46aa9bf619fd9;p=khome.git

diff --git a/Makefile b/Makefile
index f8087cf..4e7ab3c 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,8 @@ endif
     diff \
     pull \
     mpdconf \
+    pkgs_void \
+    pkgs_void_update \
     pkgs_brew_cask_install \
     pkgs_brew_install \
     pkgs_cargo \
@@ -45,9 +47,10 @@ home: mpdconf compiled
 	find home -maxdepth 1 -print0 \
 	| $(GREP) -zv '^home$$' \
 	| xargs -0 -I% cp -Rp % ~
+	xdg-user-dirs-update
 
 mpdconf:
-	mkdir -p ~/Archives/Audio
+	mkdir -p ~/arc/aud
 	mkdir -p ~/var/lib/mpd/playlists
 	mkdir -p ~/var/log/mpd
 	mkdir -p ~/var/run/mpd
@@ -61,11 +64,22 @@ compiled:
 font_cache:
 	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
+	patch pkgs-void.list pkgs-void.list.comments.patch
+
 #
 # Golang
 #
 pkgs_golang: list pkgs-golang.list
-	go get $(shell ./list pkgs-golang.list)
+	go get -u $(shell ./list pkgs-golang.list)
 
 #
 # Ubuntu
@@ -80,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)
@@ -146,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 \