X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=Makefile;h=788b7d2160423e36c7c87bf854b99c41e9683a44;hb=4edc09cd716323167998106ba91e88963dcc22e6;hp=abcaefb08527cc69aadb3e5cff50ad7d25528d28;hpb=b602a3d110918e2aa1c7ab09fed6b17a555e2185;p=khome.git

diff --git a/Makefile b/Makefile
index abcaefb..788b7d2 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 \
@@ -61,6 +63,17 @@ 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
 #
@@ -80,10 +93,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 +159,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 \