Merge remote-tracking branch 'gum/master'

2 files changed, 47 insertions, 2 deletions

diff --git a/makefu/2configs/git/brain-retiolum.nix b/makefu/2configs/git/brain-retiolum.nix
index 18275e3df..05754dc7f 100644
--- a/makefu/2configs/git/brain-retiolum.nix
+++ b/makefu/2configs/git/brain-retiolum.nix
@@ -8,6 +8,7 @@ let
 
   krebs-repos = mapAttrs make-krebs-repo {
     brain = { };
+    krebs-secrets = { };
   };
 
 
@@ -33,7 +34,7 @@ let
     set-owners repo [ config.krebs.users.makefu ] ++ set-ro-access repo krebsminister;
 
   set-ro-access = with git; repo: user:
-      optional repo.public {
+      singleton {
         inherit user;
         repo = [ repo ];
         perm = fetch;
diff --git a/makefu/2configs/zsh-user.nix b/makefu/2configs/zsh-user.nix
index 453bfbe80..7615f4c0c 100644
--- a/makefu/2configs/zsh-user.nix
+++ b/makefu/2configs/zsh-user.nix
@@ -8,6 +8,7 @@ in
   users.extraUsers.${mainUser}.shell = "/run/current-system/sw/bin/zsh";
   programs.zsh= {
     enable = true;
+    enableCompletion = false ; #manually at the end
     interactiveShellInit = ''
       HISTSIZE=900001
       HISTFILESIZE=$HISTSIZE
@@ -29,7 +30,49 @@ in
 
       unset SSH_AGENT_PID
       export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh"
-      '';
+
+      # fzf
+      __fsel_fzf() {
+        local cmd="''${FZF_CTRL_T_COMMAND:-"command find -L . -mindepth 1 \\( -path '*/\\.*' -o -fstype 'sysfs' -o -fstype 'devfs' -o -fstype 'devtmpfs' -o -fstype 'proc' \\) -prune \
+          -o -type f -print \
+          -o -type d -print \
+          -o -type l -print 2> /dev/null | cut -b3-"}"
+        setopt localoptions pipefail 2> /dev/null
+        eval "$cmd" | FZF_DEFAULT_OPTS="--height ''${FZF_TMUX_HEIGHT:-40%} --reverse $FZF_DEFAULT_OPTS $FZF_CTRL_T_OPTS" $(__fzfcmd) -m "$@" | while read item; do
+          echo -n "''${(q)item} "
+        done
+        local ret=$?
+        echo
+        return $ret
+      }
+
+      __fzf_use_tmux__() {
+        [ -n "$TMUX_PANE" ] && [ "''${FZF_TMUX:-0}" != 0 ] && [ ''${LINES:-40} -gt 15 ]
+      }
+
+      __fzfcmd() {
+        __fzf_use_tmux__ &&
+          echo "fzf-tmux -d''${FZF_TMUX_HEIGHT:-40%}" || echo "fzf"
+      }
+
+      fzf-file-widget() {
+        LBUFFER="''${LBUFFER}$(__fsel_fzf)"
+        local ret=$?
+        zle redisplay
+        typeset -f zle-line-init >/dev/null && zle zle-line-init
+        return $ret
+      }
+      zle     -N   fzf-file-widget
+      bindkey '^T' fzf-file-widget
+
+      # Auto-Completion
+      for p in ''${(z)NIX_PROFILES}; do
+        fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions $p/share/zsh/vendor-completions)
+      done
+      autoload -U compinit && compinit
+      compdef _pass brain
+      zstyle ':completion::complete:brain::' prefix "$HOME/brain"
+    '';
 
     promptInit = ''
       RPROMPT=""
@@ -47,5 +90,6 @@ in
 
   krebs.per-user.${mainUser}.packages = [
     pkgs.nix-zsh-completions
+    pkgs.fzf
   ];
 }