Fix merge errors
This commit is contained in:
parent
ef73a11e51
commit
05c189cfa4
2 changed files with 3 additions and 3 deletions
|
@ -27,8 +27,8 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# set up fuzzy file and directory search
|
# set up fuzzy file and directory search
|
||||||
alias f="fzf -c 'find . -type f' --preview='"'head -$LINES {}'"' | xargs xdg-open"
|
alias f="fzf -c 'find . -type f' --preview='"'head -$LINES {}'"' | xargs -0 xdg-open"
|
||||||
alias F="fzf -c 'find ~ -type f' --preview='"'head -$LINES {}'"' | xargs xdg-open"
|
alias F="fzf -c 'find ~ -type f' --preview='"'head -$LINES {}'"' | xargs -0 xdg-open"
|
||||||
|
|
||||||
alias d="fzf -c 'find . -type d' --preview='ls --color='always' {}' | cd"
|
alias d="fzf -c 'find . -type d' --preview='ls --color='always' {}' | cd"
|
||||||
alias D="fzf -c 'find ~ -type d' --preview='ls --color='always' {}' --color=dark --ansi | cd"
|
alias D="fzf -c 'find ~ -type d' --preview='ls --color='always' {}' --color=dark --ansi | cd"
|
||||||
|
|
|
@ -4,4 +4,4 @@
|
||||||
# https://github.com/swalladge/dotfiles/blob/master/local/share/qutebrowser/userscripts/wallabag_add.sh
|
# https://github.com/swalladge/dotfiles/blob/master/local/share/qutebrowser/userscripts/wallabag_add.sh
|
||||||
|
|
||||||
# v2.*
|
# v2.*
|
||||||
echo "open https://read.martyoeh.me/bookmarklet?url=$QUTE_URL" >> "$QUTE_FIFO"
|
echo "open https://read.martyoeh.me/bookmarklet?url=$QUTE_URL" >>"$QUTE_FIFO"
|
||||||
|
|
Loading…
Reference in a new issue