From 1b619d9dfcc8fc59f6478fbdd72370f49dde9689 Mon Sep 17 00:00:00 2001 From: Noah Masur Date: Wed, 25 Nov 2020 17:56:17 -0500 Subject: [PATCH] more fzf tweaks --- fish.configlink/config.fish | 3 ++- fish.configlink/functions/gittools.fish | 7 +++++++ nvim.configlink/init.vim | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/fish.configlink/config.fish b/fish.configlink/config.fish index 353dcb2..5d9e95e 100644 --- a/fish.configlink/config.fish +++ b/fish.configlink/config.fish @@ -42,7 +42,8 @@ if status --is-interactive # Fuzzy finder fzf_key_bindings - set -g FZF_DEFAULT_COMMAND 'fd --type file --hidden' + set -g FZF_DEFAULT_COMMAND 'fd --type file' + set -g FZF_CTRL_T_COMMAND "$FZF_DEFAULT_COMMAND" set -g FZF_DEFAULT_OPTS '-m --height 50% --border' # Use `starship` prompt diff --git a/fish.configlink/functions/gittools.fish b/fish.configlink/functions/gittools.fish index b54caa8..56dc60a 100644 --- a/fish.configlink/functions/gittools.fish +++ b/fish.configlink/functions/gittools.fish @@ -13,6 +13,11 @@ function gittools and git checkout $branch end + function git-show-fuzzy + set commit (git log --pretty=oneline | fzf | cut -d' ' -f1) + and git show $commit + end + function git-merge-fuzzy set branch (git-fuzzy-branch "merge from...") and git merge $branch @@ -33,6 +38,8 @@ function gittools switch $argv[1] case "checkout" git-checkout-fuzzy + case "show" + git-show-fuzzy case "merge" git-merge-fuzzy case "branch" diff --git a/nvim.configlink/init.vim b/nvim.configlink/init.vim index ec875e0..499ffb1 100644 --- a/nvim.configlink/init.vim +++ b/nvim.configlink/init.vim @@ -134,7 +134,7 @@ nnoremap gp :Git push nnoremap wm :only " Open file tree -noremap t :Fern . -drawer -width=35 -toggle= +noremap ft :Fern . -drawer -width=35 -toggle= " CoC Settings "-------------