Fix incomplete merge in shell aliases

This commit is contained in:
Sage Vaillancourt 2023-12-13 13:53:02 -05:00
parent cd0357d2fc
commit 9971875597
1 changed files with 0 additions and 3 deletions

View File

@ -47,12 +47,9 @@ function ww {
ws $(rg --no-line-number --no-filename . ~/wiki | sed 's/[^a-zA-Z0-9]\+/\n/g' | grep -v "^$" | sort -f | uniq -ci | sort -hr | fzf -i | cut -c 9-) ws $(rg --no-line-number --no-filename . ~/wiki | sed 's/[^a-zA-Z0-9]\+/\n/g' | grep -v "^$" | sort -f | uniq -ci | sort -hr | fzf -i | cut -c 9-)
} }
<<<<<<< HEAD
=======
if command -v bat; then if command -v bat; then
alias cat="bat -p" alias cat="bat -p"
fi fi
>>>>>>> 12ed01fb9697f14a24fde45d561a42e4b71d3cf1
export FZF_DEFAULT_COMMAND='fd --type f' export FZF_DEFAULT_COMMAND='fd --type f'
alias fzf="fzf --preview 'bat --style=numbers --color=always {}'" alias fzf="fzf --preview 'bat --style=numbers --color=always {}'"