From 879bd475fe7e6d4e41a5804b431e3cee3f313b87 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Mon, 4 Feb 2019 09:57:54 -0600 Subject: [PATCH] Implement changes from work machine --- apps/git/config | 11 +++++++---- scripts/bin/setbg | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/apps/git/config b/apps/git/config index fbbc7b9..911ca3f 100644 --- a/apps/git/config +++ b/apps/git/config @@ -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' - diff --git a/scripts/bin/setbg b/scripts/bin/setbg index ada419d..55c155f 100755 --- a/scripts/bin/setbg +++ b/scripts/bin/setbg @@ -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"