From ea00dfb8a5afaf5fd508c9c0d185cbaa743c8c51 Mon Sep 17 00:00:00 2001
From: Dustin Swan <dustin@dustinswan.com>
Date: Sun, 18 Feb 2018 16:59:47 -0500
Subject: [PATCH] Some fish stuff

---
 config.fish | 20 +++++++++++---------
 symlinks.sh |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/config.fish b/config.fish
index 60d1630..8ce83d6 100644
--- a/config.fish
+++ b/config.fish
@@ -30,18 +30,18 @@ if command --search p4 >/dev/null
 end
 
 # PATH
-set -x PATH $HOME/dotfiles/bin $PATH
-# set -x PATH $HOME/.local/bin $PATH
-set -x PATH $HOME/.npm-packages/bin $PATH
-# set -x PATH /usr/local/opt/python/libexec/bin $PATH
-set -x PATH $HOME/.cargo/bin $PATH
+test -e $HOME/dotfiles/bin ; and set -x PATH $HOME/dotfiles/bin $PATH
+test -e $HOME/.local/bin ; and set -x PATH $HOME/.local/bin $PATH
+test -e $HOME/.npm-packeges/bin ; and set -x PATH $HOME/.npm-packages/bin $PATH
+test -e /usr/local/opt/python/libexec/bin ; and set -x PATH /usr/local/opt/python/libexec/bin $PATH
+test -e $HOME/.cargo/bin ; and set -x PATH $HOME/.cargo/bin $PATH
 
 # Keychain
-if status --is-interactive
+# if status --is-interactive
     # TODO Take this out when keychain fixes this bug
-    set -x GPG_AGENT_INFO "~/.gnupg/S.gpg-agent:"(pgrep gpg-agent)":1"
-    keychain --eval --inherit any --agents gpg,ssh --quiet id_rsa 2B3A6377 | source
-end
+    # set -x GPG_AGENT_INFO "~/.gnupg/S.gpg-agent:"(pgrep gpg-agent)":1"
+    # keychain --eval --inherit any --agents gpg,ssh --quiet id_rsa 2B3A6377 | source
+    # end
 
 # iTerm2
 test -e {$HOME}/.iterm2_shell_integration.fish ; and source {$HOME}/.iterm2_shell_integration.fish
@@ -57,3 +57,5 @@ end
 if test -n "$EMACS"
   set -x TERM eterm-color
 end
+
+set fish_greeting ""
diff --git a/symlinks.sh b/symlinks.sh
index 8db1792..0c34d25 100644
--- a/symlinks.sh
+++ b/symlinks.sh
@@ -3,7 +3,7 @@
 # ln -sf ~/dotfiles/zshrc ~/.zshrc
 mkdir -p ~/.config/fish; ln -sf ~/dotfiles/config.fish ~/.config/fish/config.fish
 curl -Lo ~/.config/fish/functions/fisher.fish --create-dirs https://git.io/fisher
-ln -s ~/dotfiles/fishfile ~/.config/fish/fishfile
+ln -sf ~/dotfiles/fishfile ~/.config/fish/fishfile
 mkdir ~/.ghc; ln -sf ~/dotfiles/ghci.conf ~/.ghc/ghci.conf
 ln -sf ~/dotfiles/gitconfig ~/.gitconfig
 ln -sf ~/dotfiles/tmux.conf ~/.tmux.conf