Add some fixups and more removals

3 files changed, 1 insertions, 53 deletions

diff --git a/bashrc b/bashrc
index f36391e..397994c 100644
--- a/bashrc
+++ b/bashrc
@@ -10,13 +10,6 @@ if [ -f /etc/bashrc ]; then
 	. /etc/bashrc
 fi
 
-# Source all completions
-if [ -d ~/.bash_completions ]; then
-	for F in $(find ~/.bash_completions -type f); do
-		. "$F"
-	done
-fi
-
 # PROMPT #######################################################
 PS1='$(
 if [ `id -u` -eq "0" ]; then
@@ -41,27 +34,3 @@ case "$TERM" in
 		trap 'settitle' DEBUG
 		;;
 esac
-
-# Completions ##################################################
-
-_gitbmerge() {
-	local cur prev
-	_init_completion || return
-	[ $COMP_CWORD -gt 1 ] &&  return # Complete only single dependency
-	COMPREPLY=()
-	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 ops=""
-	for B in "$GDIR"/refs/heads/*; do
-		# TODO skip branch on HEAD
-		ops="$ops ${B#$GDIR/refs/heads/}"
-	done
-	COMPREPLY+=($(compgen -W "${ops}" -- ${cur}))
-}
-complete -F _gitbmerge gitbmerge
diff --git a/install b/install
index 1dcadee..9d1264a 100755
--- a/install
+++ b/install
@@ -33,6 +33,7 @@ fi
 
 if ask "Install configurations for various utility tools"; then
 	inst screenrc ~/.screenrc
+	mkdir -p ~/.config/htop
 	inst config/htop/htoprc ~/.config/htop/htoprc
 fi
 
diff --git a/zshrc b/zshrc
index ed2058d..92b8592 100644
--- a/zshrc
+++ b/zshrc
@@ -10,7 +10,6 @@ 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
@@ -86,27 +85,6 @@ 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*)