small gtk fixes, update dunstrc, modules, user.js

change gtk paths to Paper-Mono-Dark
pull speeddating.vim
user-js-updater.sh now suppresses some errors, shows diff

diff --git a/base/.vim/pack/speeddating.vim/start/vim-speeddating b/base/.vim/pack/speeddating.vim/start/vim-speeddating
index a418667791f03694065948342f2d6c5cca8d0f32..799cd3473bc64adcb6b556bf349f549570666b62 160000 (submodule)
--- a/base/.vim/pack/speeddating.vim/start/vim-speeddating
+++ b/base/.vim/pack/speeddating.vim/start/vim-speeddating
@@ -1 +1 @@
-Subproject commit a418667791f03694065948342f2d6c5cca8d0f32
+Subproject commit 799cd3473bc64adcb6b556bf349f549570666b62

diff --git a/firefox/user-js-updater.sh b/firefox/user-js-updater.sh
index 6e17577c67f63d4963fb4852ba6446b3cc80afe3..58594d4e797fc3e29660a6094ee58c56ce666bc8 100755 (executable)
--- a/firefox/user-js-updater.sh
+++ b/firefox/user-js-updater.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 mv user.js user.js.bak >/dev/null 2>&1
 ghacksjs="https://raw.githubusercontent.com/ghacksuserjs/ghacks-user.js/master/user.js"
-if ! command -v curl; then
+if ! command -v curl >/dev/null; then
     # Based on busybox-compatible wget
     wget -q "$ghacksjs"
 else
@@ -9,3 +9,4 @@ else
 fi
 echo >> user.js
 cat user-overrides.js >> user.js
+diff user.js.bak user.js 2>/dev/null

diff --git a/xdg/dunst/dunstrc b/xdg/dunst/dunstrc
index 9c6b7d7fdd71399a5c533e1c3c76ee4eded58f32..d392f7e1fda0034c849b7e8e7a033491e58797a2 100644 (file)
--- a/xdg/dunst/dunstrc
+++ b/xdg/dunst/dunstrc
@@ -14,9 +14,9 @@ separator_color = frame
 padding = 4
 horizontal_padding = 4
 icon_position = left
-icon_folders = "/home/ds6/.icons/Paper/16x16/status/:/home/ds6/.icons/Paper/16x16/devices/:/home/ds6/.icons/Paper/16x16/emblems/:/usr/local/share/icons/Adwaita/16x16/status/:/usr/local/share/icons/Adwaita/16x16/devices/:/usr/local/share/icons/Adwaita/16x16/emblems/"
+icon_path = "~/.icons/Paper-Dark/16x16/status/:~/.icons/Paper-Dark/16x16/devices/:~/.icons/Paper-Dark/16x16/emblems/~/.icons/Paper/16x16/status/:~/.icons/Paper/16x16/devices/:~/.icons/Paper/16x16/emblems/:/usr/local/share/icons/Adwaita/16x16/status/:/usr/local/share/icons/Adwaita/16x16/devices/:/usr/local/share/icons/Adwaita/16x16/emblems/"
 
-dmenu = "/home/ds6/bin/dmenu -p dunst:"
+dmenu = "~/bin/dmenu -p dunst:"
 browser = /usr/local/bin/luakit
 
 [shortcuts]

diff --git a/xdg/gtk-3.0/settings.ini b/xdg/gtk-3.0/settings.ini
index ac357d9aa78225f64d50383ea8f243398192fe80..5af6b5fa543660529d1b731f21bb8a62de89d5b8 100644 (file)
--- a/xdg/gtk-3.0/settings.ini
+++ b/xdg/gtk-3.0/settings.ini
@@ -2,7 +2,7 @@
 gtk-theme-name=Blackbird
 gtk-icon-theme-name=Paper-Mono-Dark
 gtk-font-name=Dina 10
-gtk-cursor-theme-name=Paper
+gtk-cursor-theme-name=Paper-Mono-Dark
 gtk-cursor-theme-size=0
 gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ
 gtk-toolbar-icon-size=GTK_ICON_SIZE_SMALL_TOOLBAR