X-Git-Url: https://git.xandkar.net/?p=khome.git;a=blobdiff_plain;f=Makefile;h=02522ba5f37d149633b43e4854925913336dae51;hp=ee489e5261d2dd95a95b5e53721e09e06ec9649b;hb=cca3111ee83093100193ccfacfc102f6c407066f;hpb=31b0313bf1dbc6245527ba0959d186953b3c5e42

diff --git a/Makefile b/Makefile
index ee489e5..02522ba 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,8 @@ MAKEFLAGS := --no-builtin-rules
 DEPS := $(wildcard deps/*)
 
 .PHONY: \
+    default \
+    clean \
     $(DEPS) \
     deps \
     home \
@@ -17,7 +19,14 @@ DEPS := $(wildcard deps/*)
     pkgs_snap_classic \
     pkgs_snap_strict
 
-home: mpdconf
+default:
+	@echo '================================================================================'
+	@echo '| Default target disabled. Specify a concrete one.'
+	@echo '================================================================================'
+	@exit 1
+
+home: mpdconf compiled
+	@cp  -Rp       bin           $(HOME)/
 	@cp  -Rp  home/bin           $(HOME)/
 	@cp  -Rp  home/lib           $(HOME)/
 	@cp       home/.compton.conf $(HOME)/
@@ -25,7 +34,6 @@ home: mpdconf
 	@cp  -Rp  home/.newsboat/    $(HOME)/
 	@cp       home/.profile      $(HOME)/
 	@cp       home/.fonts.conf   $(HOME)/
-	@fc-cache                    $(HOME)/.fonts
 	@cp       home/.Rprofile     $(HOME)/
 	@cp       home/.tmux.conf    $(HOME)/
 	@cp       home/.xbindkeysrc  $(HOME)/
@@ -37,22 +45,46 @@ mpdconf:
 	@mkdir -p ~/var/run/mpd
 	@cp home/.mpdconf $(HOME)/
 
-pkgs_debian:
-	$(MAKE) pkgs_deb_install
-	$(MAKE) pkgs_deb_purge
-	$(MAKE) pkgs_pip
-	$(MAKE) pkgs_snap_classic
-	$(MAKE) pkgs_snap_strict
+compiled:
+	mkdir -p bin
+	cd src && make
+	mv src/clockloop bin/
+
+font_cache:
+	@fc-cache -fv
+
+#
+# Golang
+#
+pkgs_golang: list pkgs-golang.list
+	go get $(shell ./list pkgs-golang.list)
 
+#
+# Ubuntu
+#
 pkgs_ubuntu: list pkgs-ubuntu.list
 	sudo apt install $(shell ./list pkgs-ubuntu.list)
 
+pkgs_ubuntu_debfiles: list pkgs-ubuntu-debfiles.list
+	./install-debfiles pkgs-ubuntu-debfiles.list
+
+#
+# PIP
+#
+pkgs_pip:
+	sudo pip3 install $(shell ./list pkgs-pip.list)
+
+#
+# Homebrew/Mac
+#
+
 pkgs_mac:
 	$(MAKE) pkgs_brew_install
 	$(MAKE) pkgs_brew_cask_install
 
-pkgs_pip:
-	sudo pip3 install $(shell ./list pkgs-pip.list)
+# TODO: Test pkgs_brew_tap when list contains multiple items
+pkgs_brew_tap: list pkgs-brew-tap.list
+	brew tap $(shell ./list pkgs-brew-tap.list)
 
 pkgs_brew_install: list pkgs-brew-install.list
 	brew install $(shell ./list pkgs-brew-install.list)
@@ -60,12 +92,18 @@ pkgs_brew_install: list pkgs-brew-install.list
 pkgs_brew_cask_install: list pkgs-brew-cask-install.list
 	brew cask install $(shell ./list pkgs-brew-cask-install.list)
 
+#
+# Debian
+#
 pkgs_deb_install: list pkgs-deb-install.list
 	sudo apt install $(shell ./list pkgs-deb-install.list)
 
 pkgs_deb_purge: list pkgs-deb-purge.list
 	sudo apt purge $(shell ./list pkgs-deb-purge.list)
 
+#
+# Snap
+#
 pkgs_snap_classic: list pkgs-snap-classic.list
 	@$(MAKE) $(foreach p,$(shell ./list pkgs-snap-classic.list),pkg_snap_classic_$(p))
 
@@ -88,20 +126,10 @@ endef
 $(foreach d,$(DEPS),$(eval $(call GEN_DEP_RULE,$(d))))
 
 diff:
-	diff $(HOME)/.Rprofile                       home/.Rprofile
-	diff $(HOME)/.compton.conf                   home/.compton.conf
-	diff $(HOME)/.config/dunst/dunstrc           home/.config/dunst/dunstrc
-	diff $(HOME)/.config/mimeapps.list           home/.config/mimeapps.list
-	diff $(HOME)/.config/neofetch/config.conf    home/.config/neofetch/config.conf
-	diff $(HOME)/.config/ranger/rc.conf          home/.config/ranger/rc.conf
-	diff $(HOME)/.fonts.conf                     home/.fonts.conf
-	diff $(HOME)/.mpdconf                        home/.mpdconf
-	diff $(HOME)/.newsboat/config                home/.newsboat/config
-	diff $(HOME)/.profile                        home/.profile
-	diff $(HOME)/.tmux.conf                      home/.tmux.conf
-	diff $(HOME)/.xbindkeysrc                    home/.xbindkeysrc
-	diff $(HOME)/lib/login_aliases.sh            home/lib/login_aliases.sh
-	diff $(HOME)/lib/login_functions.sh          home/lib/login_functions.sh
-	diff $(HOME)/lib/login_variables.sh          home/lib/login_variables.sh
-	diff $(HOME)/lib/login_variables_dpi_high.sh home/lib/login_variables_dpi_high.sh
-	diff $(HOME)/lib/login_variables_dpi_norm.sh home/lib/login_variables_dpi_norm.sh
+	find home -type f -print0 \
+	| sed -z 's/^home\///g' \
+	| xargs -0 -I% sh -c 'echo %; diff --color=always ~/% home/%'
+
+clean:
+	rm -rf ./debfiles
+	cd src && make clean