diff options
-rw-r--r-- | .config/git/config | 2 | ||||
-rw-r--r-- | .config/zsh/.zprofile | 1 | ||||
-rw-r--r-- | .config/zsh/utils.zsh | 15 | ||||
-rw-r--r-- | .config/zsh/zprofile | 10 |
4 files changed, 22 insertions, 6 deletions
diff --git a/.config/git/config b/.config/git/config index e1a2122..6be8b88 100644 --- a/.config/git/config +++ b/.config/git/config @@ -27,4 +27,4 @@ tree = log --all --graph --oneline unstage = restore --staged [gpg] - program = gpg2 + program = gpg diff --git a/.config/zsh/.zprofile b/.config/zsh/.zprofile new file mode 100644 index 0000000..5aecf11 --- /dev/null +++ b/.config/zsh/.zprofile @@ -0,0 +1 @@ +source $ZDOTDIR/zprofile diff --git a/.config/zsh/utils.zsh b/.config/zsh/utils.zsh index bc986d9..2d292ea 100644 --- a/.config/zsh/utils.zsh +++ b/.config/zsh/utils.zsh @@ -23,13 +23,13 @@ unset grep_opts if has eza; then alias ls='eza' alias ll='eza --long --header --all' -elif ls --color &> /dev/null; then +elif ls --almost-all &> /dev/null; then alias ls='ls --color=auto' - alias ll='ls -l --almost-all --no-group --human-readable' + alias ll='ls -l --almost-all --no-group --human-readable --color=auto' else # bsd/mac ls - export CLICOLOR='1' - alias ll='ls -hoA' + alias ls='ls -G' + alias ll='ls -hoAG' fi # tree @@ -42,7 +42,12 @@ alias mkdir='mkdir -p' alias dd="dd status=progress oflag=direct,sync" ## df -alias df="df -TH --exclude-type=tmpfs --exclude-type=devtmpfs --exclude-type=squashfs" +if df --exclude-type=tmpfs &> /dev/null; then + alias df="df -TH --exclude-type=tmpfs --exclude-type=devtmpfs --exclude-type=squashfs --exclude-type=udev" +else + # bsd/mac df + alias df="df -YH -T noautofs,devfs,tmpfs,squashfs" +fi # gpg has gpg2 && alias gpg='gpg2' diff --git a/.config/zsh/zprofile b/.config/zsh/zprofile new file mode 100644 index 0000000..9e6b587 --- /dev/null +++ b/.config/zsh/zprofile @@ -0,0 +1,10 @@ +if command -v brew &> /dev/null; then + export HOMEBREW_PREFIX="/usr/local" + export HOMEBREW_CELLAR="/usr/local/Cellar" + export HOMEBREW_REPOSITORY="/usr/local/Homebrew" + fpath[1,0]="/usr/local/share/zsh/site-functions" + PATH="/usr/local/bin:/usr/local/sbin:/System/Cryptexes/App/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/local/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/appleinternal/bin:$HOME/.local/bin" + export PATH; + [ -z "${MANPATH-}" ] || export MANPATH=":${MANPATH#:}" + export INFOPATH="/usr/local/share/info:${INFOPATH:-}" +fi |