From 09f6d9bd31a913551fef42c3d10a24cbe3996be7 Mon Sep 17 00:00:00 2001
From: Starfall <us@starfall.systems>
Date: Mon, 16 Sep 2024 09:04:38 -0500
Subject: zsh: minor cleanup

---
 .config/zsh/history.zsh |  3 ---
 .config/zsh/prompt.zsh  |  3 ---
 .config/zsh/utils.zsh   | 12 +++---------
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/.config/zsh/history.zsh b/.config/zsh/history.zsh
index be23491..162be39 100644
--- a/.config/zsh/history.zsh
+++ b/.config/zsh/history.zsh
@@ -2,8 +2,6 @@
 HISTFILE=${ZDOTDIR:-$HOME}/.zsh_history
 HISTSIZE=10000
 SAVEHIST=$HISTSIZE
-# setopt extended_history     # write timestamp (redundant with share_history?)
-# setopt inc_append_history   # write always, not just at end of session (redundant and exclusive with share_history)
 setopt hist_ignore_space    # add leading space to hide from history
 setopt hist_ignore_dups     # deduplicate commands run twice in a row
 setopt hist_ignore_all_dups # deduplicate entire history file
@@ -12,7 +10,6 @@ setopt hist_verify          # confirm before executing
 setopt share_history        # import all of history in new sessions
 
 # search all of history, or display just the last 16 like the builtin `history`
-# yes we should probably just use fzf which we have installed just for this
 function h () {
 	[ $# -eq 0 ] &&\
 		fc -l ||\
diff --git a/.config/zsh/prompt.zsh b/.config/zsh/prompt.zsh
index 6ae208e..eecc39e 100644
--- a/.config/zsh/prompt.zsh
+++ b/.config/zsh/prompt.zsh
@@ -1,7 +1,4 @@
 # prompt
-# TODO maybe just use someone else's theme altogether
-# TODO location should control its length a little better
-# TODO only color the last segment of the path (pwd)?
 setopt prompt_subst
 
 autoload -Uz vcs_info
diff --git a/.config/zsh/utils.zsh b/.config/zsh/utils.zsh
index 486484a..bc986d9 100644
--- a/.config/zsh/utils.zsh
+++ b/.config/zsh/utils.zsh
@@ -6,9 +6,7 @@ function has () {
 }
 
 # cat
-if has bat; then
-	alias cat='bat --plain --paging=never'
-fi
+has bat && alias cat='bat --plain --paging=never'
 # should consider another alias for --show-all (and --number on base cat) but it's not a good default
 
 # diff
@@ -35,9 +33,7 @@ else
 fi
 
 # tree
-if has tree; then
-	alias tree='tree -C'
-fi
+has tree && alias tree='tree -C'
 
 # mkdir
 alias mkdir='mkdir -p'
@@ -49,9 +45,7 @@ alias dd="dd status=progress oflag=direct,sync"
 alias df="df -TH --exclude-type=tmpfs --exclude-type=devtmpfs --exclude-type=squashfs"
 
 # gpg
-if has gpg2; then
-	alias gpg='gpg2'
-fi
+has gpg2 && alias gpg='gpg2'
 
 # cygwin-specific
 if [[ "$OSTYPE" == 'cygwin' ]]; then
-- 
cgit