From 9fc8b81fcecacd2d2ec0be076387386974849ac1 Mon Sep 17 00:00:00 2001
From: Colin Powell <colin@onec.me>
Date: Mon, 24 Dec 2018 10:52:27 -0500
Subject: [PATCH] Fix fish existing with PID active for fasd

---
 config/fish/conf.d/__fasd_run.fish         | 10 ++++++----
 config/fish/conf.d/plugin-direnv_init.fish |  8 ++++++++
 config/fish/fishfile                       |  1 +
 config/fish/functions/de.fish              |  2 +-
 config/fish/functions/wanip.fish           |  3 +++
 gitignore                                  |  1 +
 6 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 config/fish/conf.d/plugin-direnv_init.fish
 create mode 100644 config/fish/functions/wanip.fish

diff --git a/config/fish/conf.d/__fasd_run.fish b/config/fish/conf.d/__fasd_run.fish
index 0f9d174..c6bc46a 100644
--- a/config/fish/conf.d/__fasd_run.fish
+++ b/config/fish/conf.d/__fasd_run.fish
@@ -1,4 +1,6 @@
-  function __fasd_run -e fish_preexec -d "fasd takes record of the directories changed into"
-    command fasd --proc (command fasd --sanitize "$argv") > "/dev/null" 2>&1 &
-  end
-  
\ No newline at end of file
+function __fasd_run -e fish_preexec -d "fasd takes record of the directories changed into"
+    if test $argv[1] != "exit"
+        command fasd --proc (command fasd --sanitize "$argv") > "/dev/null" 2>&1 &
+    end
+end
+  
diff --git a/config/fish/conf.d/plugin-direnv_init.fish b/config/fish/conf.d/plugin-direnv_init.fish
new file mode 100644
index 0000000..b0488f0
--- /dev/null
+++ b/config/fish/conf.d/plugin-direnv_init.fish
@@ -0,0 +1,8 @@
+if type -q direnv
+  function __direnv_export_eval --on-variable PWD
+    status --is-command-substitution; and return
+    eval (direnv export fish)
+  end
+else
+  echo "Install direnv first! Check http://direnv.net" ^&1
+end
diff --git a/config/fish/fishfile b/config/fish/fishfile
index 42ff29b..0e1b83f 100644
--- a/config/fish/fishfile
+++ b/config/fish/fishfile
@@ -5,3 +5,4 @@ fishgretel/fasd
 asdf-vm/asdf
 edc/bass
 oh-my-fish/theme-mtahmed
+oh-my-fish/plugin-direnv
diff --git a/config/fish/functions/de.fish b/config/fish/functions/de.fish
index b7f4ae2..25ca225 100644
--- a/config/fish/functions/de.fish
+++ b/config/fish/functions/de.fish
@@ -1,5 +1,5 @@
 function de
-	pushd ~/devel/elationemr/hippo
+	pushd ~/devel/elationemr/hippo-local
 	docker-compose $argv
 	popd
 end
diff --git a/config/fish/functions/wanip.fish b/config/fish/functions/wanip.fish
new file mode 100644
index 0000000..7785d35
--- /dev/null
+++ b/config/fish/functions/wanip.fish
@@ -0,0 +1,3 @@
+function wanip
+	dig +short myip.opendns.com @resolver1.opendns.com
+end
diff --git a/gitignore b/gitignore
index 12a15de..d1b5798 100644
--- a/gitignore
+++ b/gitignore
@@ -27,3 +27,4 @@ package-lock.json
 .rest
 ._*
 .stignore
+local-config.diff