*: Wrap lines at 80 columns where appropriate
Wrap lines at 80 columns where appropriate and I had the energy to think about how/where to wrap. There are still lines longer than that, which I plan to wrap in the future. But that is enough for now.
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
## Author: druckdev
|
||||
## Created: 2018-11-23
|
||||
|
||||
# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.config/zsh/.zshrc.
|
||||
# Enable Powerlevel10k instant prompt. Should stay close to the top.
|
||||
# Initialization code that may require console input (password prompts, [y/n]
|
||||
# confirmations, etc.) must go above this block; everything else may go below.
|
||||
if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
|
||||
|
||||
@@ -43,7 +43,8 @@ pushd -q "$WORKTREE_PATH"
|
||||
|
||||
# Restart the shell (forcefully interactive) until the worktree is removed
|
||||
until [[ ! -e "$WORKTREE_PATH" ]] || git worktree remove "$WORKTREE_PATH"; do
|
||||
[[ -t 0 ]] || >&2 printf "Dropping into interactive shell to resolve conflicts\n"
|
||||
[[ -t 0 ]] ||
|
||||
>&2 printf "Dropping into interactive shell to resolve conflicts\n"
|
||||
"$SHELL" -i && errc=$? || errc=$?
|
||||
done
|
||||
|
||||
|
||||
@@ -12,7 +12,9 @@ zstyle ':completion:*' menu select=2
|
||||
zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS}
|
||||
zstyle ':completion:*' list-colors ''
|
||||
zstyle ':completion:*' list-prompt %SAt %p: Hit TAB for more, or the character to insert%s
|
||||
zstyle ':completion:*' matcher-list '' 'm:{a-z}={A-Z}' 'm:{-_a-zA-Z}={_-A-Za-z}' 'r:|[._-]=* r:|=* l:|=*'
|
||||
zstyle ':completion:*' matcher-list '' 'm:{a-z}={A-Z}' \
|
||||
'm:{-_a-zA-Z}={_-A-Za-z}' \
|
||||
'r:|[._-]=* r:|=* l:|=*'
|
||||
zstyle ':completion:*' menu select=long
|
||||
zstyle ':completion:*' select-prompt %SScrolling active: current selection at %p%s
|
||||
zstyle ':completion:*' use-compctl false
|
||||
|
||||
@@ -305,8 +305,9 @@ crypt-close() {
|
||||
fi
|
||||
udisksctl power-off -b "$1"
|
||||
|
||||
rm ~/mounts/"${mount_point:t}" && rmdir --ignore-fail-on-non-empty ~/mounts/ \
|
||||
|| echo "~/mounts/${mount_point:t} did not exist"
|
||||
rm ~/mounts/"${mount_point:t}" \
|
||||
&& rmdir --ignore-fail-on-non-empty ~/mounts/ \
|
||||
|| echo "~/mounts/${mount_point:t} did not exist"
|
||||
}
|
||||
|
||||
if (( $+commands[trash] )); then
|
||||
|
||||
Reference in New Issue
Block a user