From 04029c520f4cd1c7fbf9444e6ba5304b632d23f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Mon, 18 Sep 2017 20:20:01 +0200
Subject: Add completions for gitbmerge

---
 zshrc | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'zshrc')

diff --git a/zshrc b/zshrc
index 150d286..dceef1b 100644
--- a/zshrc
+++ b/zshrc
@@ -90,6 +90,27 @@ lrbell_end() {
 
 add-zsh-hook preexec lrbell_begin
 add-zsh-hook precmd lrbell_end
+# Completions ##################################################
+
+_gitbmerge() {
+	(( CURRENT > 2)) &&  return # Complete only single dependency
+	local GDIR="$(pwd)"
+	while [ ! -d "$GDIR/.git"  ]; do
+		[ -z "$GDIR" ] && return
+		GDIR="${GDIR%/*}"
+	done
+	GDIR="$GDIR/.git"
+	[ -f "$GDIR" ] && GDIR="$(cat "$GDIR")" # This just points to some other directory
+	[ -d "$GDIR/refs/heads" ] || return # No completion if there is no local branch
+	local branches=()
+	for B in "$GDIR"/refs/heads/*; do
+		# TODO skip branch on HEAD
+		branches+=("${B#$GDIR/refs/heads/}")
+	done
+	_describe -t branches 'gitbmerge' branches
+}
+compdef _gitbmerge gitbmerge
+
 ################################################################
 case "$TERM" in
 	xterm*|*rxvt*)
-- 
cgit v1.2.3


From 39da53ab62b710a231cef8cea50bfa316816f2ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Mon, 18 Sep 2017 21:04:04 +0200
Subject: Add completions for usbkey

---
 zshrc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'zshrc')

diff --git a/zshrc b/zshrc
index dceef1b..c8f8f31 100644
--- a/zshrc
+++ b/zshrc
@@ -10,6 +10,7 @@ zstyle ':completion:*' cache-path ~/.cache/zsh
 zstyle :compinstall filename '/home/kkoci/.zshrc'
 zstyle -e ':completion:*:default' list-colors 'reply=("${PREFIX:+=(#bi)($PREFIX:t)(?)*==32=33}:${(s.:.)LS_COLORS}")'
 zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}
+fpath=(~/.zsh_completions $fpath)
 
 autoload -Uz compinit && compinit
 autoload -Uz colors && colors
-- 
cgit v1.2.3


From 2fc8d93ef509f583f6977588c7b3fb2cf8ebd332 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Thu, 5 Oct 2017 23:33:39 +0200
Subject: Drop annoyme from shell and some other small changes

---
 zshrc | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'zshrc')

diff --git a/zshrc b/zshrc
index c8f8f31..ed2058d 100644
--- a/zshrc
+++ b/zshrc
@@ -37,14 +37,9 @@ bindkey    "^[[3~"          delete-char
 bindkey    "^[3;5~"         delete-char
 
 # PROMPT #######################################################
-annoyme_check() {
-	which annoyme >/dev/null 2>&1 && ls ~/.annoyme/*.pid 2>/dev/null >&2 && \
-		echo "%{$fg_bold[red]%}!"
-}
-
 [ $UID -eq 0 ] && NCOLOR="red" || NCOLOR="green"
 PROMPT="%(?..%{$fg_bold[yellow]%}EXIT: %?
-)\$(annoyme_check)%{$fg_bold[$NCOLOR]%}%n@%m:%{$fg_bold[blue]%}%1~%{$fg_bold[$NCOLOR]%}%(!.#.$)%{$reset_color%} "
+)%{$fg_bold[$NCOLOR]%}%n@%m:%{$fg_bold[blue]%}%1~%{$fg_bold[$NCOLOR]%}%(!.#.$)%{$reset_color%} "
 unset NCOLOR
 
 if [ -e ~/.local/git-prompt.sh ]; then
@@ -71,9 +66,9 @@ lrbell_active_window_id() {
 
 lrbell_begin() {
 	lrbell_timestamp=$EPOCHSECONDS
-	lrbell_message="`pwd`: $1"
 	if [ -n "$DISPLAY" ]; then
-		lrbell_window_id=$(lrbell_active_window_id)
+		lrbell_message="`pwd`: $1"
+		lrbell_window_id="$(lrbell_active_window_id)"
 	fi
 }
 lrbell_end() {
-- 
cgit v1.2.3