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

Implement changes from work machine

Browse source
This commit is contained in:
Daniel Flanagan 2019-02-04 09:57:54 -06:00
parent 12d479d22e
commit 879bd475fe
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/git/config
View file

@ -1,10 +1,16 @@
[push] [push]
default = matching default = current
[user] [user]
name = Daniel Flanagan name = Daniel Flanagan
email = daniel@lytedev.io email = daniel@lytedev.io
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[core] [core]
editor = nvim editor = nvim
pager = less -r pager = less -r
@ -31,9 +37,6 @@
[mergetool "nvimdiff"] [mergetool "nvimdiff"]
cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[push]
default = current
[pager] [pager]
branch = false branch = false
diff = nvim -c 'silent %sm/\\e.\\{-}m//g' -c 'silent %s/^diff/\\r\\rdiff/' -c 'silent set ft=diff' -c 'silent setlocal nobuflisted buftype=nofile bufhidden=wipe noswapfile' -c 'goto 1' - diff = nvim -c 'silent %sm/\\e.\\{-}m//g' -c 'silent %s/^diff/\\r\\rdiff/' -c 'silent set ft=diff' -c 'silent setlocal nobuflisted buftype=nofile bufhidden=wipe noswapfile' -c 'goto 1' -

2
scripts/bin/setbg
View file

@ -3,5 +3,5 @@
index="${2}" index="${2}"
wp_file="${HOME}/.wallpaper${index}" wp_file="${HOME}/.wallpaper${index}"
rm -f "${wp_file}" rm -f "${wp_file}"
ln -s "${1}" "${wp_file}" ln -s "$(realpath "${1}")" "${wp_file}"
"${HOME}/.fehbg" "${HOME}/.fehbg"