From f45febbc37f85193155e41479ac7fd3c172b85a7 Mon Sep 17 00:00:00 2001
From: Jeremy Kaplan <jeremydkaplan@gmail.com>
Date: Mon, 6 Jun 2016 15:23:55 -0400
Subject: [PATCH] Push zsh things in the correct files

---
 etc/.profile      |  7 -------
 install.conf.yaml |  3 ++-
 zsh/.zshenv       | 17 +++++++++++++++++
 zsh/.zshrc        |  4 ----
 4 files changed, 19 insertions(+), 12 deletions(-)
 delete mode 100644 etc/.profile
 create mode 100644 zsh/.zshenv

diff --git a/etc/.profile b/etc/.profile
deleted file mode 100644
index 97b7820..0000000
--- a/etc/.profile
+++ /dev/null
@@ -1,7 +0,0 @@
-export EDITOR='emacs'
-export VISUAL=$EDITOR
-
-export WORKON_HOME=$HOME/.virtualenvs
-source /usr/bin/virtualenvwrapper.sh
-
-export XDG_CONFIG_HOME=$HOME/.config
diff --git a/install.conf.yaml b/install.conf.yaml
index 656068d..183dd0b 100644
--- a/install.conf.yaml
+++ b/install.conf.yaml
@@ -6,6 +6,7 @@
     ~/.config/i3status: i3status/
     ~/.config/zsh: zsh/
     ~/.zshrc: zsh/.zshrc
+    ~/.zshenv: zsh/.zshenv
     ~/.zprofile: zsh/.zprofile
     ~/.hgrc: hg/.hgrc
     ~/.config/git: git
@@ -15,10 +16,10 @@
     ~/.pentadactylrc: pentadactyl/.pentadactylrc
     ~/.Xresources: X/.Xresources
     ~/.Xdefaults: X/.Xdefaults
-    ~/.profile: etc/.profile
     ~/.urlview: urlview/.urlview
     ~/.config/user-dirs.dirs: etc/user-dirs.dirs
     ~/.tmux.conf: tmux/.tmux.conf
     ~/.config/bspwm: bspwm/
     ~/.config/sxhkd: sxhkd/
     ~/.config/panel: panel/
+    ~/.config/nvim: neovim/
diff --git a/zsh/.zshenv b/zsh/.zshenv
new file mode 100644
index 0000000..16c1271
--- /dev/null
+++ b/zsh/.zshenv
@@ -0,0 +1,17 @@
+export PATH=$PATH:$HOME/bin
+
+export EDITOR='emacs'
+export VISUAL=$EDITOR
+
+export WORKON_HOME=$HOME/.virtualenvs
+source /usr/bin/virtualenvwrapper.sh
+
+export XDG_CONFIG_HOME=$HOME/.config
+
+if [ -n "$SSH_CLIENT" ] || [ -n "$SSH_CLIENT" ] || [ -n "$SSH_CLIENT" ]; then
+    SHELL_TYPE='remote/ssh'
+else
+    SHELL_TYPE='local'
+fi
+
+export SHELL_TYPE
diff --git a/zsh/.zshrc b/zsh/.zshrc
index e50f8c3..072b060 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -70,7 +70,3 @@ eval $(dircolors $HOME/.config/zsh/dircolors.256dark)
 
 autoload -U select-word-style
 select-word-style bash
-
-export PATH=$PATH:$HOME/bin
-
-[ -f ~/.profile ] && source ~/.profile