From 52deaa94931447a87782f84298564ad6f1ba7050 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <e.litherlandsmith@icloud.com>
Date: Fri, 3 Feb 2023 20:46:06 +0000
Subject: [PATCH] Remove profile, make zprofile source profile if available but
 not version controlled

---
 .profile  | 3 ---
 .zprofile | 2 ++
 Makefile  | 6 ++----
 zshrc     | 2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)
 delete mode 100644 .profile

diff --git a/.profile b/.profile
deleted file mode 100644
index 57911749..00000000
--- a/.profile
+++ /dev/null
@@ -1,3 +0,0 @@
-export PYENV_ROOT="$HOME/.pyenv"
-export PATH="$PYENV_ROOT/bin:$PATH"
-eval "$(pyenv init --path)"
diff --git a/.zprofile b/.zprofile
index 57911749..6ee924af 100644
--- a/.zprofile
+++ b/.zprofile
@@ -1,3 +1,5 @@
+[ -f "$HOME/.profile" ] && source "$HOME/.profile"
+
 export PYENV_ROOT="$HOME/.pyenv"
 export PATH="$PYENV_ROOT/bin:$PATH"
 eval "$(pyenv init --path)"
diff --git a/Makefile b/Makefile
index b9b775bc..e29f6738 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,6 @@ clean:
 	for link in $(CONFIG_TARGETS); do rm "$$link"; done
 	for link in $(FONT_TARGETS); do rm "$$link"; done
 	for link in $(ZSH_TARGETS); do rm "$$link"; done
-	rm $(HOME)/.profile
 	rm $(HOME)/.zprofile
 	rm $(HOME)/.zshrc
 	rm $(HOME)/.p10k.zsh
@@ -32,7 +31,7 @@ clean:
 	rm -rf $(PACKER_DIR)
 	rm -rf $(POWERLEVEL_DIR)
 
-zsh: $(HOME)/.profile $(HOME)/.zprofile $(HOME)/.zshrc $(ZSH_DIR) $(ZSH_CUSTOM_DIR) $(POWERLEVEL_DIR) $(HOME)/.p10k.zsh $(ZSH_TARGETS)
+zsh: $(HOME)/.zprofile $(HOME)/.zshrc $(ZSH_DIR) $(ZSH_CUSTOM_DIR) $(POWERLEVEL_DIR) $(HOME)/.p10k.zsh $(ZSH_TARGETS)
 
 ssh: $(HOME)/.ssh/config $(HOME)/.ssh/sockets $(HOME)/.ssh/config.d
 
@@ -41,12 +40,11 @@ nvim: $(PACKER_DIR)
 $(CONFIG_TARGETS): $(CONFIG_DIR)/%: config/%
 $(FONT_TARGETS): $(FONT_DIR)/%: nerdfont_symbols/%
 $(ZSH_TARGETS): $(ZSH_CUSTOM_DIR)/%.zsh: ohmyzsh/%.zsh
-$(HOME)/.profile: .profile
 $(HOME)/.zprofile: .zprofile
 $(HOME)/.zshrc: zshrc
 $(HOME)/.p10k.zsh: p10k.zsh
 $(HOME)/.ssh/config: $(HOME)/.ssh/%: ssh-%
-$(CONFIG_TARGETS) $(FONT_TARGETS) $(ZSH_TARGETS) $(HOME)/.profile $(HOME)/.zprofile $(HOME)/.zshrc $(HOME)/.p10k.zsh $(HOME)/.ssh/config:
+$(CONFIG_TARGETS) $(FONT_TARGETS) $(ZSH_TARGETS) $(HOME)/.zprofile $(HOME)/.zshrc $(HOME)/.p10k.zsh $(HOME)/.ssh/config:
 	ln -s $(PWD)/$? $@
 
 $(PACKER_DIR):
diff --git a/zshrc b/zshrc
index fc8cd605..6eb28633 100644
--- a/zshrc
+++ b/zshrc
@@ -77,7 +77,7 @@ ZSH_THEME="powerlevel10k/powerlevel10k" # set by `omz`
 # Custom plugins may be added to $ZSH_CUSTOM/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(git fzf)
+plugins=(git fzf pyenv poetry)
 
 source $ZSH/oh-my-zsh.sh