From 3c8846108590bd83e5752faa9821130525a54170 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Sat, 19 Dec 2020 08:30:13 -0700
Subject: [PATCH] macos fixes

---
 .zlogin | 41 ++++++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/.zlogin b/.zlogin
index 62ff6e4..1e3f035 100644
--- a/.zlogin
+++ b/.zlogin
@@ -1,6 +1,6 @@
-export PLAN9=~/src/plan9port
-export PATH=$PATH:$HOME/go/bin:$PLAN9/bin
-export GEM_HOME=~/ruby_bin
+#export PLAN9=~/src/plan9port
+#export PATH=$PATH:$HOME/go/bin:$PLAN9/bin
+export PATH=$PATH:$HOME/go/bin
 
 # That sweet sweet ^W
 WORDCHARS='*?_-.[]~=&;!#$%^(){}<>'
@@ -8,9 +8,9 @@ WORDCHARS='*?_-.[]~=&;!#$%^(){}<>'
 autoload -Uz compinit && compinit
 autoload -Uz vcs_info
 autoload -Uz colors && colors
-[ -n "$BASH" ] && complete -F _fzf_complete_doge -o default -o bashdefault doge
+#[ -n "$BASH" ] && complete -F _fzf_complete_doge -o default -o bashdefault doge
 
-#export GPG_AGENT_INFO="~/.gnupg/S.gpg-agent:$(pgrep gpg-agent):1"
+export GPG_AGENT_INFO="~/.gnupg/S.gpg-agent:$(pgrep gpg-agent):1"
 #/usr/local/bin/keychain --inherit any --agents ssh,gpg -q -Q
 #[[ -f ~/.keychain/ufo.local-sh-gpg  ]] && . ~/.keychain/ufo.local-sh-gpg
 
@@ -25,22 +25,29 @@ zstyle ':vcs_info:git:*' check-for-changes true
 zstyle ':vcs_info:git:*' formats '[%b]'
 
 PROMPT="%n@%m[%(?.%{$fg[white]%}.%{$fg[red]%})%?%{$reset_color%}]:%~\${vcs_info_msg_0_}%# "
-#alias bpass="env DISPLAY=:1 pass"
-#alias spass="env PASSWORD_STORE_DIR=~/.secret-store pass"
-alias 'gopatch=WRKDIST=$(make show=WRKSRC) make update-patches'
+
+case "$(uname -s)" in
+	Darwin)
+		;;
+	OpenBSD)
+		alias 'gopatch=WRKDIST=$(make show=WRKSRC) make update-patches'
+		alias cabal='env TMPDIR=/usr/local/cabal/build/ cabal'
+		alias cdw='cd $(make show=WRKSRC)'
+		alias irc="export TERM=xterm; tmux at -t irc"
+		alias man='man -Owidth=$(($COLUMNS<80?($COLUMNS-2):78))'
+		alias mutt='stty discard undef; neomutt'
+		alias pkg_add="pkg_add -Dsnap"
+		alias pkg_delete="pkg_delete -Dsnap"
+		alias pup='doas -n /usr/sbin/pkg_add -u'
+		;;
+	*)
+esac
+
 alias ag='ag --nocolor'
-alias cabal='env TMPDIR=/usr/local/cabal/build/ cabal'
-alias cdw='cd $(make show=WRKSRC)'
 alias ec='emacsclient -ct'
-alias irc="export TERM=xterm; tmux at -t irc"
-#alias man='man -Owidth=$(($COLUMNS<80?($COLUMNS-2):78))'
 alias mkae='make'
-alias mutt='stty discard undef; neomutt'
 alias pass="gopass"
-alias pkg_add="pkg_add -Dsnap"
-alias pkg_delete="pkg_delete -Dsnap"
-alias pup='doas -n /usr/sbin/pkg_add -u'
 alias rustc='rustc --color=never'
 alias sbcl="rlwrap sbcl"
 alias tmux="tmux -2"
-alias dotconf='/usr/bin/git --git-dir=$HOME/.dotconf --work-tree=$HOME'
+alias dotconf="$(which git) --git-dir=$HOME/.dotconf --work-tree=$HOME"