From 2cb3b103a900a92f920db78fe24b469782a899e7 Mon Sep 17 00:00:00 2001
From: Sebastian Bugge <vkbugge@hotmail.com>
Date: Fri, 23 Aug 2024 15:54:50 +0200
Subject: [PATCH] Move env and completions to correct places.

---
 .zprofile           | 19 +++++++++++++++++++
 .profile => .zshenv | 24 +++++-------------------
 .zshrc              | 14 ++------------
 3 files changed, 26 insertions(+), 31 deletions(-)
 create mode 100644 .zprofile
 rename .profile => .zshenv (68%)

diff --git a/.zprofile b/.zprofile
new file mode 100644
index 0000000..f0934e1
--- /dev/null
+++ b/.zprofile
@@ -0,0 +1,19 @@
+ASDF_TMP=$(mktemp)
+if asdf current golang >"$ASDF_TMP" 2>/dev/null; then
+	ASDF_GO="$HOME/.asdf/installs/golang/$(awk -F' ' '{print $2}' <"$ASDF_TMP")"
+fi
+if [ -d "$ASDF_GO" ]; then
+	ASDF_GOBIN="$ASDF_GO/packages/bin/"
+	PATH="$ASDF_GOBIN:$PATH"
+fi
+
+export NVM_DIR="$HOME/.nvm"
+if [ -s "$NVM_DIR/nvm.sh" ]; then
+	\. "$NVM_DIR/nvm.sh"          # This loads nvm
+fi
+
+[ -f "/home/kaholaz/.ghcup/env" ] && source "/home/kaholaz/.ghcup/env" # ghcup-env
+
+if [ -d "$HOME/.asdf" ]; then
+	\. "$HOME/.asdf/asdf.sh"
+fi
diff --git a/.profile b/.zshenv
similarity index 68%
rename from .profile
rename to .zshenv
index 9e8e7f3..9733f9b 100644
--- a/.profile
+++ b/.zshenv
@@ -1,3 +1,8 @@
+export HISTFILESIZE=1000000000
+export HISTSIZE=1000000000
+
+export EDITOR='nvim'
+
 # set PATH so it includes user's private bin if it exists
 if [ -d "$HOME/bin" ]; then
 	PATH="$HOME/bin:$PATH"
@@ -27,23 +32,8 @@ if [ -d "$ASDF_GO" ]; then
 	PATH="$ASDF_GOBIN:$PATH"
 fi
 
-export NVM_DIR="$HOME/.nvm"
-if [ -s "$NVM_DIR/nvm.sh" ]; then
-	\. "$NVM_DIR/nvm.sh"          # This loads nvm
-	\. "$NVM_DIR/bash_completion" # nvm bash completions
-fi
-
-if [ -s "$HOME/.local_profile" ]; then
-	\. "$HOME/.local_profile"
-fi
-
 [ -f "/home/kaholaz/.ghcup/env" ] && source "/home/kaholaz/.ghcup/env" # ghcup-env
 
-if [ -d "$HOME/.asdf" ]; then
-	\. "$HOME/.asdf/asdf.sh"
-	\. "$HOME/.asdf/completions/asdf.bash"
-fi
-
 if [ -f "$HOME/.local/share/pnpm" ]; then
 	export PNPM_HOME="$HOME/.local/share/pnpm"
 	case ":$PATH:" in
@@ -51,7 +41,3 @@ if [ -f "$HOME/.local/share/pnpm" ]; then
 	*) export PATH="$PNPM_HOME:$PATH" ;;
 	esac
 fi
-
-if [ -n "$ZSH_VERSION" ] && type "hugo" >/dev/null; then
-	. <(hugo completion zsh)
-fi
diff --git a/.zshrc b/.zshrc
index b90372a..bbd67ed 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,5 +1,3 @@
-source ~/.profile
-
 export ZSH="$HOME/.oh-my-zsh"
 ZSH_THEME="afowler"
 
@@ -39,13 +37,6 @@ else
 	HAS_NETWORK=0
 fi
 
-# Preferred editor for local and remote sessions
-if [[ -n $SSH_CONNECTION ]]; then
-  export EDITOR='nvim'
-else
-  export EDITOR='nvim'
-fi
-
 # Attach to a tmux session on startup
 if [ -z "$TMUX" ] && [ -n "$SSH_CONNECTION" ]; then
     tmux attach -t Default || tmux new -s Default
@@ -59,7 +50,6 @@ if [ -z "$TMUX" ] && [[ "$HAS_NETWORK" == 1 ]]; then
     fortune -s
 fi
 
-export HISTFILESIZE=1000000000
-export HISTSIZE=1000000000
-
 source ~/.aliases
+fpath+=~/.zfunc
+autoload -U compinit; compinit