aliases/apt

@@ -8,18 +8,11 @@ grep -iq 'ID_LIKE=debian' /etc/os-release || \
 	grep -iq 'NAME=Debian' /etc/os-release || \
 	return
 
-alias xowner="dpkg -S"
-alias xfiles="dpkg -L"
-
-alias sv="systemctl"
-
-if (( $+commands[nala] )); then
-	alias xq="nala search"
-	alias xi="sudo nala install"
-	alias xupdate="sudo nala upgrade"
-else
 alias xq="apt-cache search"
 alias xi="sudo apt-get install"
+alias xowner="dpkg -S"
+alias xfiles="dpkg -L"
+alias sv="systemctl"
 
 xupdate() {
 	sudo -v
@@ -31,4 +24,3 @@ else
 		read -q && sudo apt upgrade -y
 	fi
 }
-fi

aliases/functions

@@ -392,10 +392,3 @@ if exists gron; then
 	gron | grep "$@" | gron -u
     }
 fi
-
-autostash() {
-    git stash
-    git "$@"
-    git stash pop
-}
-compdef _git autostash

aliases/git

@@ -33,8 +33,8 @@ defvcsfun gcm       "commit"            "commit"        "commit"
 defvcsfun ga        "add"               "add"           "add"
 defvcsfun gpu       "push"              "push"          "i_am_not_distributed_please_dont_push_me"
 
-alias gs="git switch"
 alias gco="git checkout"
+alias gca="git commit -a"
 alias gap="git add --patch"
 
 

plugins/cdup/cdup.plugin.zsh

@@ -1,64 +1,20 @@
 
-PROJECT_ROOT_INDICATORS=(.git .hg package.json build.sbt)
-
-# These commands find the topmost (i.e. shortest full path) project directory in
-# the hierarchy of the given directory.
-# cdup:    changes to the match
-# _cdup:   prints the match
-# _cdup_r: sets ~r as named dir for the match (set up as a chpwd hook)
-#
-# args: (cdup|_cdup) [-c] DIR [PROJECT_ROOT_INDICATOR...]
-#   -c / --closest  return the nearest project directory, i.e. least steps up,
-#                   possibly including the current directory
-#
-#   DIR is starting point for the search
-#   A PROJECT_ROOT_INDICATOR are files to look for to detect project roots. If
-#   not given, a default list is used. $PROJECT_ROOT_INDICATORS can be used to
-#   override the default globally
-
 _cdup() {
-	zparseopts -D -E c=closest -closest=closest
 	local dir=$1; shift
 	local targets=("$@")
-	local match nextmatch
 	for target in $targets; do
 		if [[ -e $dir/$target ]]; then
-			if [[ $closest ]]; then
-				echo $dir
-				return
-			else
-				match=$dir
-				break
-			fi
+			cd $dir
+			return 0
 		fi
 	done
-	if [[ $dir != "/" ]]; then
-		nextmatch=$(_cdup ${dir:h} ${targets[@]})
-		match=${nextmatch:-$match}
-	fi
-
-	if [[ $match ]]; then echo $match; return 0;
-	else return 1
+	if [[ $dir == "/" ]]; then return 1
+	else _cdup ${dir:h} ${targets[@]}
 	fi
 }
 
 cdup() {
-	zparseopts -D -E c=closest -closest=closest
-	local target=$(_cdup $closest ${PWD:h} ${@:-$PROJECT_ROOT_INDICATORS})
-	if [[ $? != 0 ]]; then return 1;
-	else cd $target
+	if [[ ${#@} -gt 0 ]]; then _cdup ${PWD:h} "$@"
+	else _cdup ${PWD:h} .git .hg package.json build.sbt
 	fi
 }
-
-_cdup_r () {
-	_cdup_project_root=$(_cdup ${PWD} ${PROJECT_ROOT_INDICATORS})
-	hash -d r=$_cdup_project_root
-}
-
-_prompt_cdup() {
-	[[ -n $_cdup_project_root ]] && echo "project: ${_cdup_project_root:h:t}/${_cdup_project_root:t}"
-}
-
-autoload -U add-zsh-hook
-add-zsh-hook chpwd _cdup_r
-_cdup_r

zshrc

@@ -128,10 +128,6 @@ if exists mail; then
     __chromaz_extra_left+=_prompt_cron_mails
 fi
 
-if exists _prompt_cdup; then
-    __chromaz_extra_left+=_prompt_cdup
-fi
-
 tabs -4
 #zprof