X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=Makefile;h=896938e38df61fe30dc4ff39795fc2446ef23e03;hb=1fab13024b7dba54192b720c0ff00239e1d79a0a;hp=e57052a6a719faca8b1199eb9dd3c51040d3f5bf;hpb=2b497be2faa21b4312c70a3a347be1225e973958;p=khome.git

diff --git a/Makefile b/Makefile
index e57052a..896938e 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@ MAKEFLAGS := --no-builtin-rules
 DEPS := $(wildcard deps/*)
 
 .PHONY: \
+	default \
     $(DEPS) \
     deps \
     home \
@@ -13,17 +14,25 @@ DEPS := $(wildcard deps/*)
     pkgs_deb_purge \
     pkgs_debian \
     pkgs_mac \
+    pkgs_pip \
     pkgs_snap_classic \
     pkgs_snap_strict
 
+default:
+	@echo '================================================================================'
+	@echo '| Default target disabled. Specify a concrete one.'
+	@echo '================================================================================'
+	@exit 1
+
 home: mpdconf
 	@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)/
-	@fc-cache                    $(HOME)/.fonts
+	@fc-cache -fv
 	@cp       home/.Rprofile     $(HOME)/
 	@cp       home/.tmux.conf    $(HOME)/
 	@cp       home/.xbindkeysrc  $(HOME)/
@@ -35,16 +44,16 @@ mpdconf:
 	@mkdir -p ~/var/run/mpd
 	@cp home/.mpdconf $(HOME)/
 
-pkgs_debian:
-	$(MAKE) pkgs_deb_install
-	$(MAKE) pkgs_deb_purge
-	$(MAKE) pkgs_snap_classic
-	$(MAKE) pkgs_snap_strict
+pkgs_ubuntu: list pkgs-ubuntu.list
+	sudo apt install $(shell ./list pkgs-ubuntu.list)
 
 pkgs_mac:
 	$(MAKE) pkgs_brew_install
 	$(MAKE) pkgs_brew_cask_install
 
+pkgs_pip:
+	sudo pip3 install $(shell ./list pkgs-pip.list)
+
 pkgs_brew_install: list pkgs-brew-install.list
 	brew install $(shell ./list pkgs-brew-install.list)
 
@@ -77,3 +86,23 @@ $(1):
 endef
 
 $(foreach d,$(DEPS),$(eval $(call GEN_DEP_RULE,$(d))))
+
+diff:
+	diff  $(HOME)/.Rprofile                           home/.Rprofile                           ||  true
+	diff  $(HOME)/.compton.conf                       home/.compton.conf                       ||  true
+	diff  $(HOME)/.config/dunst/dunstrc               home/.config/dunst/dunstrc               ||  true
+	diff  $(HOME)/.config/mimeapps.list               home/.config/mimeapps.list               ||  true
+	diff  $(HOME)/.config/neofetch/config.conf        home/.config/neofetch/config.conf        ||  true
+	diff  $(HOME)/.config/ranger/rc.conf              home/.config/ranger/rc.conf              ||  true
+	diff  $(HOME)/.config/screengrab/screengrab.conf  home/.config/screengrab/screengrab.conf  ||  true
+	diff  $(HOME)/.fonts.conf                         home/.fonts.conf                         ||  true
+	diff  $(HOME)/.mpdconf                            home/.mpdconf                            ||  true
+	diff  $(HOME)/.newsboat/config                    home/.newsboat/config                    ||  true
+	diff  $(HOME)/.profile                            home/.profile                            ||  true
+	diff  $(HOME)/.tmux.conf                          home/.tmux.conf                          ||  true
+	diff  $(HOME)/.xbindkeysrc                        home/.xbindkeysrc                        ||  true
+	diff  $(HOME)/lib/login_aliases.sh                home/lib/login_aliases.sh                ||  true
+	diff  $(HOME)/lib/login_functions.sh              home/lib/login_functions.sh              ||  true
+	diff  $(HOME)/lib/login_variables.sh              home/lib/login_variables.sh              ||  true
+	diff  $(HOME)/lib/login_variables_dpi_high.sh     home/lib/login_variables_dpi_high.sh     ||  true
+	diff  $(HOME)/lib/login_variables_dpi_norm.sh     home/lib/login_variables_dpi_norm.sh     ||  true