From 82d21c3cc882ef1c8a754f7515c72e159864a259 Mon Sep 17 00:00:00 2001 From: ds6 Date: Mon, 19 Nov 2018 10:42:43 -0600 Subject: [PATCH] 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 --- base/.vim/pack/speeddating.vim/start/vim-speeddating | 2 +- firefox/user-js-updater.sh | 3 ++- xdg/dunst/dunstrc | 4 ++-- xdg/gtk-3.0/settings.ini | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/base/.vim/pack/speeddating.vim/start/vim-speeddating b/base/.vim/pack/speeddating.vim/start/vim-speeddating index a418667..799cd34 160000 --- 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 6e17577..58594d4 100755 --- 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 9c6b7d7..d392f7e 100644 --- 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 ac357d9..5af6b5f 100644 --- 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 -- 2.47.0