Merge remote-tracking branch 'github/master'

diff --git a/Makefile b/Makefile
index ca39916..0051363 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,8 @@ DEPS := $(wildcard deps/*)
     $(DEPS) \
     deps \
     home \
+    diff \
+    pull \
     mpdconf \
     pkgs_brew_cask_install \
     pkgs_brew_install \
@@ -126,24 +128,14 @@ 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
+       find home -type f -print0 \
+       | sed -z 's/^home\///g' \
+       | xargs -0 -I% sh -c 'echo %; diff --color=always ~/% home/%'
+
+pull:
+       find home -type f -print0 \
+       | sed -z 's/^home\///g' \
+       | xargs -0 -I% sh -c 'diff -q ~/% home/% > /dev/null || cp ~/% home/%'
 
 clean:
        rm -rf ./debfiles

diff --git a/home/.config/mimeapps.list b/home/.config/mimeapps.list
index c2721e3..857dcae 100644 (file)
--- a/home/.config/mimeapps.list
+++ b/home/.config/mimeapps.list
@@ -1,7 +1,7 @@
 [Added Associations]
 video/webm=mpv.desktop;
-image/png=eom.desktop;
-image/jpeg=eom.desktop;
+image/png=eom.desktop;sxiv.desktop;
+image/jpeg=eom.desktop;sxiv.desktop;
 application/pdf=atril.desktop;
 text/plain=gvim.desktop;
 text/x-ocaml=gvim.desktop;
@@ -16,5 +16,6 @@ video/quicktime=mpv.desktop;
 
 [Default Applications]
 text/plain=gvim.desktop
-image/jpeg=eog.desktop
+image/jpeg=sxiv.desktop
 application/illustrator=gimp.desktop
+image/png=sxiv.desktop

diff --git a/home/.config/screengrab/screengrab.conf b/home/.config/screengrab/screengrab.conf
index 8455753..b6ccac0 100644 (file)
--- a/home/.config/screengrab/screengrab.conf
+++ b/home/.config/screengrab/screengrab.conf
@@ -18,8 +18,8 @@ lastSelection=@Rect(7 55 1485 1940)
 showTrayIcon=false
 timeTrayMessages=5
 trayMessages=1
-windowHeight=2024
-windowWidth=2426
+windowHeight=1146
+windowWidth=1316
 zoomAroundMouse=false
 
 [GlobalShortcuts]

diff --git a/notes-ubuntu.md b/notes-ubuntu.md
index 84423e8..36a3f35 100644 (file)
--- a/notes-ubuntu.md
+++ b/notes-ubuntu.md
@@ -14,3 +14,11 @@ Fonts
 -----
 
 https://wiki.ubuntu.com/Fonts
+
+
+Notification system
+-------------------
+
+### Disable
+
+    mv /usr/share/dbus-1/services/org.freedesktop.Notifications.service /usr/share/dbus-1/services/org.freedesktop.Notifications.service.disabled