fix merge

browser/qutebrowser/keys.conf

@@ -164,10 +164,10 @@ hint images
 hint images tab
     ;I
 
-hint links fill ":open {hint-url}"
+hint links fill :open {hint-url}
     ;o
 
-hint links fill ":open -t {hint-url}"
+hint links fill :open -t {hint-url}
     ;O
 
 hint links yank

editor/nvim/config/init.vim

@@ -38,7 +38,10 @@ Plug 'nathanaelkane/vim-indent-guides' " indentation guides (NOTE: doesn't seem
 let g:indent_guides_start_level = 0
 let g:indent_guides_auto_color = 1
 
-Plug 'Shougo/deoplete.nvim' " autocomplete
+function! DoRemote(arg)
+  UpdateRemotePlugins
+endfunction
+Plug 'Shougo/deoplete.nvim', { 'do': function('DoRemote') } " autocomplete
 let g:deoplete#enable_at_startup = 1
 
 Plug 'scrooloose/syntastic' " syntax checker

scripts/reload_xresources.sh

@@ -40,3 +40,7 @@ while read -r line; do
 	printf '\33]4;%s;%s\007' ${a[0]} $col
 	previous_colors["color${a[0]}"]="${a[1]}"
 done <<< "$values"
+
+xrdb -merge "$HOME/.Xresources"
+xrdb -merge "$HOME/.Xresources.colors"
+xrdb -merge "$HOME/.Xresources.env"