Merge branch 'master' of github.com:lytedev/dotfiles

This commit is contained in:
Daniel Flanagan 2017-07-25 19:14:05 -05:00
commit 6819fd4be2
5 changed files with 53 additions and 7 deletions

View file

@ -503,6 +503,53 @@ endif
" enter insert mode when entering a terminal buffer
autocmd BufWinEnter,WinEnter term://* startinsert
" Jump to the next or previous line that has the same level or a lower
" level of indentation than the current line.
"
" exclusive (bool): true: Motion is exclusive
" false: Motion is inclusive
" fwd (bool): true: Go to next line
" false: Go to previous line
" lowerlevel (bool): true: Go to line with lower indentation level
" false: Go to line with the same indentation level
" skipblanks (bool): true: Skip blank lines
" false: Don't skip blank lines
function! NextIndent(exclusive, fwd, lowerlevel, skipblanks)
let line = line('.')
let column = col('.')
let lastline = line('$')
let indent = indent(line)
let stepvalue = a:fwd ? 1 : -1
while (line > 0 && line <= lastline)
let line = line + stepvalue
if ( ! a:lowerlevel && indent(line) == indent ||
\ a:lowerlevel && indent(line) < indent)
if (! a:skipblanks || strlen(getline(line)) > 0)
if (a:exclusive)
let line = line - stepvalue
endif
exe line
exe "normal " column . "|"
return
endif
endif
endwhile
endfunction
" Moving back and forth between lines of same or lower indentation.
nnoremap <silent> [l :call NextIndent(0, 0, 0, 1)<CR>
nnoremap <silent> ]l :call NextIndent(0, 1, 0, 1)<CR>
nnoremap <silent> [L :call NextIndent(0, 0, 1, 1)<CR>
nnoremap <silent> ]L :call NextIndent(0, 1, 1, 1)<CR>
vnoremap <silent> [l <Esc>:call NextIndent(0, 0, 0, 1)<CR>m'gv''
vnoremap <silent> ]l <Esc>:call NextIndent(0, 1, 0, 1)<CR>m'gv''
vnoremap <silent> [L <Esc>:call NextIndent(0, 0, 1, 1)<CR>m'gv''
vnoremap <silent> ]L <Esc>:call NextIndent(0, 1, 1, 1)<CR>m'gv''
onoremap <silent> [l :call NextIndent(0, 0, 0, 1)<CR>
onoremap <silent> ]l :call NextIndent(0, 1, 0, 1)<CR>
onoremap <silent> [L :call NextIndent(1, 0, 1, 1)<CR>
onoremap <silent> ]L :call NextIndent(1, 1, 1, 1)<CR>
" run make with leader,m
nnoremap <leader>m :call RunMake()<CR>

View file

@ -19,7 +19,7 @@ bspc config focused_border_color "$(xrdb -query | sed -ne 's/.*color0\?4:\s*//p
bspc config active_border_color "$(xrdb -query | sed -ne 's/.*color0\?4:\s*//p')"
bspc config presel_feedback_color "$(xrdb -query | sed -ne 's/.*color0\?4:\s*//p')"
bspc config border_width "$BORDER_WIDTH"
bspc config split_ratio 0.50
bspc config split_ratio 0.666666
bspc config borderless_monocle true
bspc config gapless_monocle true

View file

@ -1,5 +1,6 @@
#!/usr/bin/env bash
# NO_COMPTON=1
BORDER_WIDTH=5 # change in bspwm_config, here for launcher
START_BAR=1
BAR_COMMAND="$DOTFILES_PATH/de/bar/bar.bash"
@ -43,7 +44,9 @@ if command -v unclutter >/dev/null 2>&1; then
fi
if command -v compton >/dev/null 2>&1; then
if [[ -z $NO_COMPTON ]]; then
compton &
fi
fi
# launch bar

View file

@ -54,7 +54,7 @@ super + alt + shift + {h,j,k,l}
# set node split ratio
super + ctrl + {1-9,0}
bspc node -r 0.{1-9,10}
bspc node --ratio 0.{1-9,10}
# move a floating window very slowly
super + shift + {Left,Down,Up,Right}

View file

@ -32,10 +32,6 @@ if command -v redshift >/dev/null 2>&1; then
redshift &
fi
if [ -d "/usr/lib/nvidia" ]; then
export LD_LIBRARY_PATH=/usr/lib/nvidia
fi
if [ -f "$HOME/.env_xprofile" ]; then
source "$HOME/.env_xprofile"
fi