Implement changes from work machine
This commit is contained in:
parent
12d479d22e
commit
879bd475fe
|
@ -1,10 +1,16 @@
|
|||
[push]
|
||||
default = matching
|
||||
default = current
|
||||
|
||||
[user]
|
||||
name = Daniel Flanagan
|
||||
email = daniel@lytedev.io
|
||||
|
||||
[filter "lfs"]
|
||||
clean = git-lfs clean -- %f
|
||||
smudge = git-lfs smudge -- %f
|
||||
process = git-lfs filter-process
|
||||
required = true
|
||||
|
||||
[core]
|
||||
editor = nvim
|
||||
pager = less -r
|
||||
|
@ -31,9 +37,6 @@
|
|||
[mergetool "nvimdiff"]
|
||||
cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
|
||||
|
||||
[push]
|
||||
default = current
|
||||
|
||||
[pager]
|
||||
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' -
|
||||
|
|
|
@ -3,5 +3,5 @@
|
|||
index="${2}"
|
||||
wp_file="${HOME}/.wallpaper${index}"
|
||||
rm -f "${wp_file}"
|
||||
ln -s "${1}" "${wp_file}"
|
||||
ln -s "$(realpath "${1}")" "${wp_file}"
|
||||
"${HOME}/.fehbg"
|
||||
|
|
Reference in a new issue