lytedev/dotfiles
Archived
1
0
Fork 1
Code Issues Pull requests Releases Wiki Activity

fix merge

Browse source
This commit is contained in:
Daniel Flanagan 2016-08-10 12:17:13 -05:00
parent c282a2de94 f23d1b1ae2
commit 992fe1dae9
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
browser/qutebrowser/keys.conf
View file

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

5
editor/nvim/config/init.vim
View file

@ -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_start_level = 0
let g:indent_guides_auto_color = 1 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 let g:deoplete#enable_at_startup = 1
Plug 'scrooloose/syntastic' " syntax checker Plug 'scrooloose/syntastic' " syntax checker

4
scripts/reload_xresources.sh
View file

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