Merge branch 'master' of github:GeoffreyFrogeye/dotfiles

This commit is contained in:
Geoffrey Frogeye 2016-10-09 18:06:44 +02:00
commit 40dfe36f54
2 changed files with 5 additions and 4 deletions

View file

@ -68,9 +68,9 @@ bindsym XF86MonBrightnessDown exec xbacklight -dec 20
bindsym XF86MonBrightnessUp exec xbacklight -inc 20 bindsym XF86MonBrightnessUp exec xbacklight -inc 20
# Screenshots # Screenshots
bindsym Print exec scrot -ue 'mv $f ~/.screenshots/' bindsym Print exec scrot -ue 'mv $f ~/Screenshots/'
bindsym $mod+Print exec scrot -e 'mv $f ~/.screenshots/' bindsym $mod+Print exec scrot -e 'mv $f ~/Screenshots/'
bindsym Ctrl+Print exec sleep 1 && scrot -se 'mv $f ~/.screenshots/' bindsym Ctrl+Print exec sleep 1 && scrot -se 'mv $f ~/Screenshots/'
focus_follows_mouse yes focus_follows_mouse yes
mouse_warping output mouse_warping output

3
vimrc
View file

@ -53,7 +53,7 @@ let g:ctrlp_custom_ignore = {
" Disable AutoComplPop. " Disable AutoComplPop.
let g:acp_enableAtStartup = 0 let g:acp_enableAtStartup = 0
" Use neocomplete. " Use neocomplete.
let g:neocomplete#enable_at_startup = 1 let g:neocomplete#enable_at_startup = 0
" Use smartcase. " Use smartcase.
let g:neocomplete#enable_smart_case = 1 let g:neocomplete#enable_smart_case = 1
" Set minimum syntax keyword length. " Set minimum syntax keyword length.
@ -224,6 +224,7 @@ colorscheme solarized
" From http://stackoverflow.com/a/5004785/2766106 " From http://stackoverflow.com/a/5004785/2766106
set list set list
set listchars=tab:╾╌,trail,extends:↦,precedes:↤,nbsp:_ set listchars=tab:╾╌,trail,extends:↦,precedes:↤,nbsp:_
set showbreak=
filetype on filetype on
filetype plugin on filetype plugin on