1
0
Fork 0

streamlining lf things, new functionality

This commit is contained in:
Luca Bilke 2024-02-01 18:47:57 +01:00
parent ead306e3b7
commit 1752251157
7 changed files with 98 additions and 223 deletions

View File

@ -1,4 +1,4 @@
# vim:ft=dircolors
# (This is not a dircolors file but it helps to highlight colors and comments) # (This is not a dircolors file but it helps to highlight colors and comments)
# default values from dircolors # default values from dircolors

View File

@ -11,23 +11,19 @@ set previewer "~/.config/lf/preview/chafa"
set cursorpreviewfmt "\033[7;90m" set cursorpreviewfmt "\033[7;90m"
set promptfmt "\033[34;1m%u\033[36m@\033[34m%h \033[35m[\033[0;1m%d\033[35m]\033[32m » \033[33m%f\033[0m" set promptfmt "\033[34;1m%u\033[36m@\033[34m%h \033[35m[\033[0;1m%d\033[35m]\033[32m » \033[33m%f\033[0m"
cmd pushedit %{{ # This might seem awkward, but it it needed to trigger the open for the taolf nvim plugin
echo "Open: " && read files cmd open ${{
if sh -c '[ -n "$VIM" ]'; then set +u
lf -remote "send $id vimopen $files" [ "$lf_user_multiopen" = "true" ] && { $OPENER $fx; return; }
else $OPENER "$f"
lf -remote "send $id \$echo $files | xargs -or nvim +wa"
fi
lf -remote "send $id reload"
}} }}
cmd edit ${{ cmd pushedit %{{
if sh -c "[ -n \"\$VIM\" ]"; then echo "Open: " && read files
lf -remote "send $id vimopen $fx" echo
else echo $files | xargs touch
lf -remote "send $id \$echo \$fx | xargs -or nvim +wa" lf -remote "send $id \$$OPENER $files
fi send $id unselect"
lf -remote "send $id unselect"
}} }}
cmd open-with ${{ cmd open-with ${{
@ -35,16 +31,6 @@ cmd open-with ${{
rifle -c $XDG_CONFIG_HOME/lf/rifle.conf -p $method $fx rifle -c $XDG_CONFIG_HOME/lf/rifle.conf -p $method $fx
}} }}
cmd vimopen &{{
touch "$@"
lf -remote "$(
for f in "$@"; do printf "%b" "send $id toggle $f\n"; done
printf "%b" "send $id select $f\n"
printf "%b" "send $id open\n"
printf "%b" "send $id unselect\n"
)"
}}
cmd mkdir &mkdir -p "$(echo $* | tr ' ' '\ ')" cmd mkdir &mkdir -p "$(echo $* | tr ' ' '\ ')"
cmd trash &{{ cmd trash &{{
@ -54,7 +40,7 @@ cmd trash &{{
lf -remote "send load" lf -remote "send load"
}} }}
cmd lazygit %{{ cmd lazygit ${{
dir=$(dirname "$(realpath "${f:-_}")"}) dir=$(dirname "$(realpath "${f:-_}")"})
if ! git --noglob-pathspecs -C $dir status >/dev/null 2>&1; then if ! git --noglob-pathspecs -C $dir status >/dev/null 2>&1; then
echo "Initialize git repo in '${dir}' [Y/n]:" && read yn && echo "Initialize git repo in '${dir}' [Y/n]:" && read yn &&
@ -186,18 +172,13 @@ cmd extract ${{
cmd set_previewer %{{ cmd set_previewer %{{
if [ "${1}" = "sixel" ]; then if [ "${1}" = "sixel" ]; then
lf -remote "send $id set sixel" lf -remote "send $id :set sixel; set previewer ~/.config/lf/preview/sixel; reload"
lf -remote "send $id set previewer ~/.config/lf/preview/sixel"
lf -remote "send $id reload"
echo 'Previewer set to sixel' echo 'Previewer set to sixel'
elif [ "${1}" = "ueberzug" ]; then elif [ "${1}" = "ueberzug" ]; then
lf -remote "send $id set cleaner ~/.config/lf/preview/clean" lf -remote "send $id :set cleaner ~/.config/lf/preview/clean; set previewer ~/.config/lf/preview/ueberzug; reload"
lf -remote "send $id set previewer ~/.config/lf/preview/ueberzug"
lf -remote "send $id reload"
echo 'Previewer set to ueberzug' echo 'Previewer set to ueberzug'
else else
lf -remote "send $id set previewer ~/.config/lf/preview/chafa" lf -remote "send $id :set previewer ~/.config/lf/preview/chafa; reload"
lf -remote "send $id reload"
echo 'Previewer set to chafa' echo 'Previewer set to chafa'
fi fi
}} }}
@ -222,6 +203,7 @@ map <c-e> extract
map P link map P link
# map S share # map S share
map <c-g> lazygit map <c-g> lazygit
map <a-g> $gdu
map <c-v> pushedit map <c-v> pushedit
map <c-n> push :mkdir<space> map <c-n> push :mkdir<space>
map N push :&touch<space> map N push :&touch<space>
@ -242,8 +224,9 @@ map n &echo $f | xclip -r -selection c
map <esc> quit map <esc> quit
map g/ cd "/" map g/ cd "/"
map W new_lf_term map W new_lf_term
map e edit map e :set user_multiopen "true" ; open; set user_multiopen "false"
map E $sudo -e $f map E $sudo -e $f
map R $lf -remote "send $id :select \"$(readlink $f)\""
# Load bookmark shortcuts # Load bookmark shortcuts
source "~/.config/lf/shortcutrc" source "~/.config/lf/shortcutrc"

View File

@ -1,202 +1,114 @@
# vim: ft=cfg # vim: ft=cfg
#
# This is the configuration file of "rifle", ranger's file executor/opener. #-------------------------------------------
# Each line consists of conditions and a command. For each line the conditions # Environment checks
# are checked and if they are met, the respective command is run. #-------------------------------------------
# # env NVIM, env lf_shell = $HOME/.local/libexec/vimlf-open "$@"
# Syntax:
# <condition1> , <condition2> , ... = command
#
# The command can contain these environment variables:
# $1-$9 | The n-th selected file
# $@ | All selected files
#
# If you use the special command "ask", rifle will ask you what program to run.
#
# Prefixing a condition with "!" will negate its result.
# These conditions are currently supported:
# match <regexp> | The regexp matches $1
# ext <regexp> | The regexp matches the extension of $1
# mime <regexp> | The regexp matches the mime type of $1
# name <regexp> | The regexp matches the basename of $1
# path <regexp> | The regexp matches the absolute path of $1
# has <program> | The program is installed (i.e. located in $PATH)
# env <variable> | The environment variable "variable" is non-empty
# file | $1 is a file
# directory | $1 is a directory
# number <n> | change the number of this command to n
# terminal | stdin, stderr and stdout are connected to a terminal
# X | $DISPLAY is not empty (i.e. Xorg runs)
#
# There are also pseudo-conditions which have a "side effect":
# flag <flags> | Change how the program is run. See below.
# label <label> | Assign a label or name to the command so it can
# | be started with :open_with <label> in ranger
# | or `rifle -p <label>` in the standalone executable.
# else | Always true.
#
# Flags are single characters which slightly transform the command:
# f | Fork the program, make it run in the background.
# | New command = setsid $command >& /dev/null &
# r | Execute the command with root permissions
# | New command = sudo $command
# t | Run the program in a new terminal. If $TERMCMD is not defined,
# | rifle will attempt to extract it from $TERM.
# | New command = $TERMCMD -e $command
# Note: The "New command" serves only as an illustration, the exact
# implementation may differ.
# Note: When using rifle in ranger, there is an additional flag "c" for
# only running the current file even if you have marked multiple files.
#------------------------------------------- #-------------------------------------------
# Websites # Websites
#------------------------------------------- #-------------------------------------------
# Rarely installed browsers get higher priority; It is assumed that if you ext x?html?, has brave, X, flag f = brave -- "$@"
# install a rare browser, you probably use it. Firefox/konqueror/w3m on the ext x?html?, has firefox, X, flag f = firefox -- "$@"
# other hand are often only installed as fallback browsers. ext x?html?, has chromium, X, flag f = chromium -- "$@"
ext x?html?, has qutebrowser, X, flag f = qutebrowser -- "$@" ext x?html?, has lynx, terminal = lynx -- "$@"
ext x?html?, has chromium-browser, X, flag f = chromium-browser -- "$@" ext x?html?, has w3m, terminal = w3m "$@"
ext x?html?, has chromium, X, flag f = chromium -- "$@"
ext x?html?, has firefox, X, flag f = firefox -- "$@"
ext x?html?, has elinks, terminal = elinks "$@"
ext x?html?, has links2, terminal = links2 "$@"
ext x?html?, has links, terminal = links "$@"
ext x?html?, has lynx, terminal = lynx -- "$@"
ext x?html?, has w3m, terminal = w3m "$@"
#--------------------------------------------
# Code
#------------------------------------------- #-------------------------------------------
# ext py = python -- "$1" # Misc
# ext pl = perl -- "$1" #-------------------------------------------
# ext rb = ruby -- "$1" # HACK: This '-- --' fixes nvim's argument parsing when given empty files and executed with --embed
# ext js = node -- "$1" label editor, mime ^text|x-empty$, env EMBEDDED = ${VISUAL:-$EDITOR} -- -- "$@"
# ext sh = sh -- "$1" label editor, mime ^text|x-empty$ = ${VISUAL:-$EDITOR} -- "$@"
# ext php = php -- "$1" label pager, mime ^text|x-empty$ = $PAGER -- "$@"
# ext lisp = emacs -- "$1" label editor, ext xml|json|csv|tex|py|pl|rb|rs|js|sh|php|dart = ${VISUAL:-$EDITOR} -- "$@"
label pager, ext xml|json|csv|tex|py|pl|rb|rs|js|sh|php|dart = $PAGER -- "$@"
ext cue , terminal, flag t = delay .3; vim -- "$@"
ext cue , terminal = file "$@"|less
ext cue, terminal, flag f = iconv -f cp1251 "$1" >"$1.___"; mv -f "$1.___" "$1"
#-------------------------------------------- #--------------------------------------------
# Audio without X # Audio without X
#------------------------------------------- #-------------------------------------------
mime ^audio|ogg$, terminal, has mpv ,flag t = mpv -- "$@" mime ^audio|ogg$, terminal, has mpv = mpv -- "$@"
#-------------------------------------------- #--------------------------------------------
# Video/Audio with a GUI # Video/Audio with a GUI
#------------------------------------------- #-------------------------------------------
mime ^video, has mpv, X, flag f = mpv --save-position-on-quit -- "$@" mime ^video, has mpv, X, flag f = mpv -- "$@"
ext ts, has mpv, X, flag f = mpv --save-position-on-quit -- "$@" mime ^video|^audio, has vlc, X, flag f = vlc -- "$@"
mime ^video, has mpv, X, flag f = vlc -- "$@"
#-------------------------------------------- #--------------------------------------------
# Video without X: # Video without X:
#------------------------------------------- #-------------------------------------------
mime ^video, terminal, !X, has mpv = mpv -- "$@" mime ^video, terminal, !X, has mpv = mpv -- "$@"
#torrent
ext torrent, has transmission-gtk, X, flag f = transmission-gtk -p -- "$@"
mime torrent, has transmission-gtk, X, flag f = transmission-gtk -p -- "$@"
ext torrent, has transmission-cli, terminal = transmission-cli -- "$@"
mime torrent, has transmission-cli, terminal = transmission-cli -- "$@"
#------------------------------------------- #-------------------------------------------
# Documents # Documents
#------------------------------------------- #-------------------------------------------
ext pdf, has llpp, X, flag f = llpp "$@" ext djvu, has zathura, X, flag f = zathura -- "$@"
ext pdf|djvu|epub, has zathura, X, flag f = zathura -- "$@" ext epub, has zathura, X, flag f = zathura -- "$@"
ext pdf, has firefox, X, flag f = firefox -- "$@" ext cb[rz], has zathura, X, flag f = zathura -- "$@"
ext pdf, has xournalpp, X, flag f = xournalpp -- "$@" ext pdf, has zathura, X, flag f = zathura -- "$@"
ext pdf, has mupdf, X, flag f = mupdf "$@"
ext pdf, has mupdf-x11, X, flag f = mupdf-x11 "$@"
ext pdf, has apvlv, X, flag f = apvlv -- "$@"
ext pdf, has xpdf, X, flag f = xpdf -- "$@"
ext pdf|djvu, has evince, X, flag f = evince -- "$@"
ext pdf|djvu, has atril, X, flag f = atril -- "$@"
ext pdf, has okular, X, flag f = okular -- "$@"
ext pdf, has epdfview, X, flag f = epdfview -- "$@"
ext pdf, has qpdfview, X, flag f = qpdfview "$@"
ext pdf, has open, X, flag f = open "$@"
ext docx?, has catdoc, terminal = catdoc -- "$@" | "$PAGER"
ext sxc|xlsx?|xlt|xlw|gnm|gnumeric, has gnumeric, X, flag f = gnumeric -- "$@"
ext sxc|xlsx?|xlt|xlw|gnm|gnumeric, has kspread, X, flag f = kspread -- "$@"
ext pptx?|od[dfgpst]|docx?|sxc|xlsx?|xlt|xlw|gnm|gnumeric, has libreoffice, X, flag f = libreoffice "$@" ext pptx?|od[dfgpst]|docx?|sxc|xlsx?|xlt|xlw|gnm|gnumeric, has libreoffice, X, flag f = libreoffice "$@"
ext pptx?|od[dfgpst]|docx?|sxc|xlsx?|xlt|xlw|gnm|gnumeric, has soffice, X, flag f = soffice "$@" ext docx?, has catdoc, terminal = catdoc -- "$@" | $PAGER
ext pptx?|od[dfgpst]|docx?|sxc|xlsx?|xlt|xlw|gnm|gnumeric, has ooffice, X, flag f = ooffice "$@" ext sc, has sc, = sc -- "$@"
ext djvu, has djview, X, flag f = djview -- "$@"
ext epub|mobi, X, flag f = ebook-viewer -- "$@"
#------------------------------------------- #-------------------------------------------
# Image Viewing: # Images
#------------------------------------------- #-------------------------------------------
mime ^image/svg, has inkscape, X, flag f = inkscape -- "$@" mime ^image/svg, has inkscape, X, flag f = inkscape -- "$@"
mime ^image/svg, has display, X, flag f = display -- "$@" mime ^image/svg, has display, X, flag f = display -- "$@"
mime ^image, has sxiv, X, flag f = sxiv -- "$@" mime ^image, has nsxiv, X, flag f = nsxiv -- "$@"
mime ^image, has nsxiv, X, flag f = nsxiv -- "$@" mime ^image, has sxiv, X, flag f = sxiv -- "$@"
mime ^image, has gimp, X, flag f = gimp -- "$@" mime ^image, has gimp, X, flag f = gimp -- "$@"
ext xcf, X, flag f = gimp -- "$@" mime ^image, has krita, X, flag f = krita -- "$@"
ext xcf, has gimp, X, flag f = gimp -- "$@"
ext kra, has krita, X, flag f = krita -- "$@"
#------------------------------------------- #-------------------------------------------
# Archives # Archives
#------------------------------------------- #-------------------------------------------
# avoid password prompt by providing empty password ext 7z, has 7z = 7z -p l "$@" | $PAGER
ext 7z, has 7z = 7z -p l "$@" | "$PAGER" ext ace|ar|arc|bz2?|cab|cpio|cpt|deb|dgc|dmg|gz, has atool = atool --list --each -- "$@" | $PAGER
ext ace|ar|arc|bz2?|cab|cpio|cpt|deb|dgc|dmg|gz, has atool = atool --list --each -- "$@" | "$PAGER" ext iso|jar|msi|pkg|rar|shar|tar|tgz|xar|xpi|xz|zip, has atool = atool --list --each -- "$@" | $PAGER
ext iso|jar|msi|pkg|rar|shar|tar|tgz|xar|xpi|xz|zip, has atool = atool --list --each -- "$@" | "$PAGER"
ext 7z|ace|ar|arc|bz2?|cab|cpio|cpt|deb|dgc|dmg|gz, has atool = atool --extract --each -- "$@" ext 7z|ace|ar|arc|bz2?|cab|cpio|cpt|deb|dgc|dmg|gz, has atool = atool --extract --each -- "$@"
ext iso|jar|msi|pkg|rar|shar|tar|tgz|xar|xpi|xz|zip, has atool = atool --extract --each -- "$@" ext iso|jar|msi|pkg|rar|shar|tar|tgz|xar|xpi|xz|zip, has atool = atool --extract --each -- "$@"
# Listing and extracting archives without atool: # Listing and extracting archives without atool:
ext tar|gz|bz2|xz, has tar = tar vvtf "$1" | "$PAGER" ext tar|gz|bz2|xz, has tar = tar vvtf "$1" | $PAGER
ext tar|gz|bz2|xz, has tar = for file in "$@"; do tar vvxf "$file"; done ext tar|gz|bz2|xz, has tar = for file in "$@"; do tar vvxf "$file"; done
ext bz2, has bzip2 = for file in "$@"; do bzip2 -dk "$file"; done ext bz2, has bzip2 = for file in "$@"; do bzip2 -dk "$file"; done
ext zip, has unzip = unzip -l "$1" | less ext zip, has unzip = unzip -l "$1" | less
ext zip, has unzip = for file in "$@"; do unzip -d "${file%.*}" "$file"; done ext zip, has unzip = for file in "$@"; do unzip -d "${file%.*}" "$file"; done
ext ace, has unace = unace l "$1" | less ext ace, has unace = unace l "$1" | less
ext ace, has unace = for file in "$@"; do unace e "$file"; done ext ace, has unace = for file in "$@"; do unace e "$file"; done
ext rar, has unrar = unrar l "$1" | less ext rar, has unrar = unrar l "$1" | less
ext rar, has unrar = for file in "$@"; do unrar x "$file"; done ext rar, has unrar = for file in "$@"; do unrar x "$file"; done
#------------------------------------------- #-------------------------------------------
# Misc # Fonts
#------------------------------------------- #-------------------------------------------
# Define the "editor" for text files as first action mime ^font, has fontforge, X, flag f = fontforge "$@"
mime ^inode/x-empty$, label editor = "$EDITOR" -- "$@"
mime ^inode/x-empty$, label pager = "$EDITOR" -- "$@"
mime ^text, label editor = "$EDITOR" -- "$@"
mime ^text, label pager = "$PAGER" -- "$@"
!mime ^text, label editor, ext xml|json|csv|tex|py|pl|rb|js|sh|php|rs = "$EDITOR" -- "$@"
!mime ^text, label pager, ext xml|json|csv|tex|py|pl|rb|js|sh|php|rs = "$PAGER" -- "$@"
ext 1 = man "$1"
ext s[wmf]c, has zsnes, X = zsnes "$1"
ext s[wmf]c, has snes9x-gtk,X = snes9x-gtk "$1"
ext nes, has fceux, X = fceux "$1"
ext exe = wine "$1"
name ^[mM]akefile$ = make
#------------------------------------------- #-------------------------------------------
# Flag t fallback terminals # Flag t fallback terminals
#------------------------------------------- #-------------------------------------------
# Rarely installed terminal emulators get higher priority; It is assumed that mime ^ranger/x-terminal-emulator, has st = st -e "$@"
# if you install a rare terminal emulator, you probably use it.
# gnome-terminal/konsole/xterm on the other hand are often installed as part of
# a desktop environment or as fallback terminal emulators.
mime ^ranger/x-terminal-emulator, has kitty = kitty -- "$@"
mime ^ranger/x-terminal-emulator, has st = st -e "$@"
mime ^ranger/x-terminal-emulator, has urxvt = urxvt -e "$@"
mime ^ranger/x-terminal-emulator, has xterm = xterm -e "$@" mime ^ranger/x-terminal-emulator, has xterm = xterm -e "$@"
#-------------------------------------------
# Misc
#-------------------------------------------
# This depends on my setbg script!
label wallpaper, number 11, mime ^image, X = setbg "$1"
# Define the editor for non-text files + pager as last action #-------------------------------------------
!mime ^text, !ext xml|json|csv|tex|py|pl|rb|js|sh|php = ask # Fallback
label editor, !mime ^text, !ext xml|json|csv|tex|py|pl|rb|js|sh|php = ${VISUAL:-$EDITOR} -- "$@" #-------------------------------------------
label pager, !mime ^text, !ext xml|json|csv|tex|py|pl|rb|js|sh|php = "$PAGER" -- "$@" else = ask
label open, has xdg-open = xdg-open "$@"
label open, has open = open -- "$@"
# The very last action, so that it's never triggered accidentally, is to execute a program: ######################################################################
# The actions below are left so low down in this file on purpose, so #
# they are never triggered accidentally. #
######################################################################
# Execute a file as program/script.
mime application/x-executable = "$1" mime application/x-executable = "$1"
# Move the file to trash using trash-cli.
label trash, has trash-put = trash-put -- "$@"

View File

@ -15,14 +15,9 @@ function write_title_wd() { echo -ne "\033]0;$(print -P "%n@%m [%3~]")\007"; }
function reset_beam() { echo -ne '\e[5 q'; } function reset_beam() { echo -ne '\e[5 q'; }
function lfwrap () { function lfwrap () {
export EMBEDDED=true
LF_DIRFILE="/tmp/lfdir.$(uuidgen)" LF_DIRFILE="/tmp/lfdir.$(uuidgen)"
if [ "${LF_PREVIEW_TYPE:-sixel}" = "sixel" ]; then lfX -last-dir-path="$LF_DIRFILE"
lf-sixel -last-dir-path="$LF_DIRFILE"
elif [ "${LF_PREVIEW_TYPE}" = "ueberzug" ]; then
lf-ueberzug -last-dir-path="$LF_DIRFILE"
else
lf -last-dir-path="$LF_DIRFILE"
fi
dir="$(cat "$LF_DIRFILE")" dir="$(cat "$LF_DIRFILE")"
rm "$LF_DIRFILE" rm "$LF_DIRFILE"
if [ -d "$dir" ]; then if [ -d "$dir" ]; then

View File

@ -1,11 +0,0 @@
#!/bin/sh
set -e
if [ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ]; then
# shellcheck disable=2068
command lf $@
else
[ ! -d "$HOME/.cache/lf" ] && mkdir --parents "$HOME/.cache/lf"
# shellcheck disable=2016,2068
command lf -command 'set_previewer sixel' $@ 3>&-
fi

View File

@ -7,14 +7,15 @@ clean() {
} }
if [ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ]; then if [ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ]; then
command lf "$@" # shellcheck disable=2068
command lf $@
else else
[ ! -d "$XDG_CACHE_HOME/lf" ] && mkdir --parents "$XDG_CACHE_HOME/lf" [ ! -d "$HOME/.cache/lf" ] && mkdir --parents "$HOME/.cache/lf"
export FIFO_UEBERZUG="$XDG_CACHE_HOME/lf/ueberzug-$$" export FIFO_UEBERZUG="$XDG_CACHE_HOME/lf/ueberzug-$$"
mkfifo "$FIFO_UEBERZUG" mkfifo "$FIFO_UEBERZUG"
ueberzug layer -s -p json <"$FIFO_UEBERZUG" & ueberzug layer -s -p json <"$FIFO_UEBERZUG" &
exec 3>"$FIFO_UEBERZUG" exec 3>"$FIFO_UEBERZUG"
trap clean EXIT trap clean EXIT
# shellcheck disable=2016 # shellcheck disable=2016,2068
command lf -command 'set_previewer ueberzug' "$@" 3>&- command lf $@ 3>&-
fi fi

View File

@ -1,11 +1,6 @@
#!/bin/sh #!/bin/sh
set -f
if [ "$2" ]; then [ -n "$SCRATCHPAD" ] && set -- -ft "$@"
for f in "$@"; do set -- -p0 -c "$XDG_CONFIG_HOME/lf/rifle.conf" "$@"
# shellcheck disable=2086
rifle -c "$XDG_CONFIG_HOME/lf/rifle.conf" -p 0 $f rifle "$@"
done
else
rifle -c "$XDG_CONFIG_HOME/lf/rifle.conf" -p 0 "$1"
fi