From 18c06d53bd66af878c8cc9e9317d60145438d862 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 21 Feb 2017 22:52:08 +0100 Subject: [PATCH] zsh: add options for fzf completion and git --- modules/examples/lnl.nix | 2 + modules/programs/zsh/default.nix | 21 +++++++++- modules/programs/zsh/fzf-git.zsh | 67 ++++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 modules/programs/zsh/fzf-git.zsh diff --git a/modules/examples/lnl.nix b/modules/examples/lnl.nix index 6a230c4..aa94a34 100644 --- a/modules/examples/lnl.nix +++ b/modules/examples/lnl.nix @@ -152,6 +152,8 @@ programs.zsh.enable = true; programs.zsh.enableBashCompletion = true; + programs.zsh.enableFzfCompletion = true; + programs.zsh.enableFzfGit = true; programs.zsh.enableFzfHistory = true; programs.zsh.variables.cfg = "$HOME/.nixpkgs/darwin-config.nix"; diff --git a/modules/programs/zsh/default.nix b/modules/programs/zsh/default.nix index 6dbe48d..193aebd 100644 --- a/modules/programs/zsh/default.nix +++ b/modules/programs/zsh/default.nix @@ -9,6 +9,11 @@ let zshVariables = mapAttrsToList (n: v: ''${n}="${v}"'') cfg.variables; + fzfCompletion = "${pkgs.fzf.src}/shell/completion.zsh"; + + fzfGit = ./fzf-git.zsh; + fzfHistory = ./fzf-history.zsh; + shell = pkgs.runCommand pkgs.zsh.name { buildInputs = [ pkgs.makeWrapper ]; } '' @@ -78,6 +83,18 @@ in description = "Enable bash completion for all interactive zsh shells."; }; + programs.zsh.enableFzfCompletion = mkOption { + type = types.bool; + default = false; + description = "Enable fzf completion."; + }; + + programs.zsh.enableFzfGit = mkOption { + type = types.bool; + default = false; + description = "Enable fzf keybindings for C-g git browsing."; + }; + programs.zsh.enableFzfHistory = mkOption { type = types.bool; default = false; @@ -136,7 +153,9 @@ in # This file is read for interactive shells. bindkey -e - ${optionalString cfg.enableFzfHistory "source ${./fzf-history.zsh}"} + ${optionalString cfg.enableFzfCompletion "source ${fzfCompletion}"} + ${optionalString cfg.enableFzfGit "source ${fzfGit}"} + ${optionalString cfg.enableFzfHistory "source ${fzfHistory}"} # Only execute this file once per shell. if [ -n "$__ETC_ZSHRC_SOURCED" -o -n "$NOSYSZSHRC" ]; then return; fi diff --git a/modules/programs/zsh/fzf-git.zsh b/modules/programs/zsh/fzf-git.zsh new file mode 100644 index 0000000..774c690 --- /dev/null +++ b/modules/programs/zsh/fzf-git.zsh @@ -0,0 +1,67 @@ +__fzf_is_git__() { + git rev-parse HEAD > /dev/null 2>&1 +} + +__fzfcmd_down() { + fzf --height 50% "$@" --border +} + +fzf-gitf() { + __fzf_is_git__ || return + git -c color.status=always status --short | + __fzfcmd_down -m --ansi --nth 2..,.. \ + --preview '(git diff --color=always -- {-1} | sed 1,4d; cat {-1}) | head -500' | + cut -c4- | sed 's/.* -> //' +} + +fzf-gitb() { + __fzf_is_git__ || return + git branch -a --color=always | grep -v '/HEAD\s' | sort | + __fzfcmd_down --ansi --multi --tac --preview-window right:70% \ + --preview 'git log --oneline --graph --date=short --pretty="format:%C(auto)%cd %h%d %s" $(sed s/^..// <<< {} | cut -d" " -f1) | head -'$LINES | + sed 's/^..//' | cut -d' ' -f1 | + sed 's#^remotes/##' +} + +fzf-gitt() { + __fzf_is_git__ || return + git tag --sort -version:refname | + __fzfcmd_down --multi --preview-window right:70% \ + --preview 'git show --color=always {} | head -'$LINES +} + +fzf-gith() { + __fzf_is_git__ || return + git log --date=short --format="%C(green)%C(bold)%cd %C(auto)%h%d %s (%an)" --graph --color=always | + __fzfcmd_down --ansi --no-sort --reverse --multi --bind 'ctrl-s:toggle-sort' \ + --header 'Press CTRL-S to toggle sort' \ + --preview 'grep -o "[a-f0-9]\{7,\}" <<< {} | xargs git show --color=always | head -'$LINES | + grep -o "[a-f0-9]\{7,\}" +} + +fzf-gitr() { + __fzf_is_git__ || return + git remote -v | awk '{print $1 "\t" $2}' | uniq | + __fzfcmd_down --tac \ + --preview 'git log --oneline --graph --date=short --pretty="format:%C(auto)%cd %h%d %s" {1} | head -200' | + cut -d$'\t' -f1 +} + +join-lines() { + local item + while read item; do + echo -n "${(q)item} " + done +} + +bind-git-helper() { + local char + for c in $@; do + eval "fzf-git$c-widget() { local result=\$(fzf-git$c | join-lines); zle reset-prompt; LBUFFER+=\$result }" + eval "zle -N fzf-git$c-widget" + eval "bindkey '^g$c' fzf-git$c-widget" + done +} + +bind-git-helper f b t r h +unset -f bind-git-helper