From 334f3032e8a37d91ab6a8a17eef539a41685cf7d Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Thu, 28 Sep 2023 14:41:33 +0200 Subject: [PATCH] terminal: Exchange fasd for zoxide fasd is unmaintained and slower than zoxide. The transferral was painless. I imported my old database and can continue as before. It does not care about files but that is completely fine for me. Same `z` invocation as before. Has the 'interactive' mode on `zi` which is also completely fine. --- bootstrap/packages_stable.tsv | 2 +- bootstrap/packages_testing.tsv | 16 +++++++++--- sh/.config/sh/alias.d/enable-fasd-hook.sh | 31 ----------------------- terminal/.bashrc | 1 + terminal/.config/zsh/.zshrc | 2 ++ 5 files changed, 17 insertions(+), 35 deletions(-) delete mode 100644 sh/.config/sh/alias.d/enable-fasd-hook.sh diff --git a/bootstrap/packages_stable.tsv b/bootstrap/packages_stable.tsv index 07c8f23..cda548a 100644 --- a/bootstrap/packages_stable.tsv +++ b/bootstrap/packages_stable.tsv @@ -69,7 +69,6 @@ exa ls replacement R exercism-bin Command line client for exercism.io A exfat-utils Utilities for exFAT file system R f3 Simple tool that tests flash cards capacity and performance to see if they live up to claimed specifications A -fasd Command-line productivity booster, offers quick access to files and directories R fd Simple, fast and user-friendly alternative to find R ffmpegthumbnailer Lightweight video thumbnailer that can be used by file managers R firefox Standalone web browser from mozilla.org R @@ -357,6 +356,7 @@ zathura-djvu DjVu support for Zathura R zathura-pdf-mupdf PDF support for Zathura (MuPDF backend) (Supports PDF, ePub, and OpenXPS) R zk A command-line tool helping you to maintain a Zettelkasten or personal wiki R zotero-bin Zotero Standalone. Is a free, easy-to-use tool to help you collect, organize, cite, and share your research sources. A +zoxide A smarter cd command for your terminal R zq Tooling for super-structured data A zsh-autosuggestions Fish-like autosuggestions for zsh R zsh-fast-syntax-highlighting Optimized and extended zsh-syntax-highlighting A diff --git a/bootstrap/packages_testing.tsv b/bootstrap/packages_testing.tsv index 0b7807b..c391f1a 100644 --- a/bootstrap/packages_testing.tsv +++ b/bootstrap/packages_testing.tsv @@ -1,7 +1,17 @@ Name Description Source Target adbfs-rootless-git fuse filesystem over adb tool for android devices, no device root required A -eslint An AST-based pattern checker for JavaScript R +arch-install-scripts Scripts to aid in installing Arch Linux R +blueberry Bluetooth configuration tool R +dotter-rs-bin A dotfile manager and templater written in Rust A +eza A modern replacement for ls (community fork of exa) R +feishin-appimage A modern self-hosted music player. A +git-delta Syntax-highlighting pager for git and diff output R +khal CLI calendar application built around CalDAV R m4b-tool-bin A command line utility to merge, split and chapterize audiobook files such as mp3, ogg, flac, m4a or m4b A -qutebrowser-qt6-git A keyboard-driven, vim-like browser based on PyQt5 (Qt 6 branch) A +nodejs-markmap-cli Create markmaps (mindmaps from markdown) from CLI A +pv A terminal-based tool for monitoring the progress of data through a pipeline R +qpwgraph PipeWire Graph Qt GUI Interface R texlive-latexextra TeX Live - LaTeX additional packages R -time Utility for monitoring a program's use of system resources R +toilet Free replacement for the FIGlet utility R +vifm A file manager with curses interface, which provides Vi[m]-like environment R +woeusb-ng Simple tool that enable you to create your own usb stick with Windows installer. A diff --git a/sh/.config/sh/alias.d/enable-fasd-hook.sh b/sh/.config/sh/alias.d/enable-fasd-hook.sh deleted file mode 100644 index 28b7e70..0000000 --- a/sh/.config/sh/alias.d/enable-fasd-hook.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# more usage instructions at https://github.com/clvv/fasd -# exist fasd && eval "$(fasd --init posix-hook posix_alias bash-hook zsh-hook zsh-ccomp zsh-ccomp-install zsh-wcomp zsh-wcomp-install)" -exist fasd && eval "$(fasd --init auto)" - -# any -alias a='fasd -a' -# show / search / select -alias s='fasd -si' -# alias d='fasd -d' # directory -# alias f='fasd -f' # file -# alias sd='fasd -sid' # interactive directory selection -# alias sf='fasd -sif' # interactive file selection -# cd, same functionality as j in autojump -alias z='fasd_cd -d' -# cd with interactive selection -alias zz='fasd_cd -d -i' - -# from: https://github.com/clvv/fasd/issues/10 -# since I can only load auto configuration and have default fasd_cd AND useless aliases -# or manually load the modules and NOT have fasd_cd -# it's easier to use this function -fasd_cd() { - fasd_ret="$(fasd -d "$@")" - if [ -d "$fasd_ret" ]; then - cd "$fasd_ret" || exit - else - printf "%s\n" "$fasd_ret" - fi - unset fasd_ret -} diff --git a/terminal/.bashrc b/terminal/.bashrc index 230b896..0d9ecd5 100644 --- a/terminal/.bashrc +++ b/terminal/.bashrc @@ -24,5 +24,6 @@ if [ -d "$CONFDIR/bash/alias.d" ]; then unset _alias fi +eval "$(zoxide init bash)" alias ls='ls --color=auto' PS1='[\u@\h \W]\$ ' diff --git a/terminal/.config/zsh/.zshrc b/terminal/.config/zsh/.zshrc index de6a091..180def1 100644 --- a/terminal/.config/zsh/.zshrc +++ b/terminal/.config/zsh/.zshrc @@ -99,6 +99,8 @@ ENABLE_CORRECTION="true" # allow moving through directories without prepending cd setopt autocd +eval "$(zoxide init zsh)" + # Speed up autocomplete, force prefix mapping zstyle ':completion:*' accept-exact '*(N)' zstyle ':completion:*' use-cache on