From 58d6aefd2b81023f020c0a9997b9dd448508d59a Mon Sep 17 00:00:00 2001
From: "Simen A. W. Olsen" <hello@simenandre.no>
Date: Fri, 27 Dec 2024 20:30:23 +0100
Subject: zsh fixups

---
 zsh/.config/zsh/.zshenv |  3 ---
 zsh/.config/zsh/.zshrc  | 22 ----------------------
 zsh/.zshenv             | 25 ++++++++++++++++++++++++-
 zsh/.zshrc              | 18 ++++++++++++++++++
 4 files changed, 42 insertions(+), 26 deletions(-)
 delete mode 100644 zsh/.config/zsh/.zshenv
 delete mode 100755 zsh/.config/zsh/.zshrc
 mode change 120000 => 100755 zsh/.zshenv
 create mode 100755 zsh/.zshrc

diff --git a/zsh/.config/zsh/.zshenv b/zsh/.config/zsh/.zshenv
deleted file mode 100644
index 51b9cf4..0000000
--- a/zsh/.config/zsh/.zshenv
+++ /dev/null
@@ -1,3 +0,0 @@
-export ZDOTDIR=$HOME/.config/zsh
-
-. "$HOME/.cargo/env"
diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc
deleted file mode 100755
index 9ef0a9d..0000000
--- a/zsh/.config/zsh/.zshrc
+++ /dev/null
@@ -1,22 +0,0 @@
-# Download Znap, if it's not there yet.
-[[ -r ~/.zsh_repos/znap/znap.zsh ]] ||
-    git clone --depth 1 -- \
-        https://github.com/marlonrichert/zsh-snap.git ~/.zsh_repos/znap
-source ~/.zsh_repos/znap/znap.zsh  # Start Znap
-
-export GOPATH=~/go
-export REPOS=~/ghq
-
-znap eval starship 'starship init zsh --print-full-init'
-znap prompt
-
-znap source marlonrichert/zsh-autocomplete
-znap source zsh-users/zsh-autosuggestions
-
-for file in ~/.{aliases.zsh,path.zsh,extras.zsh}; do
-	if [[ -r "$file" ]] && [[ -f "$file" ]]; then
-		# shellcheck source=/dev/null
-		source "$file"
-	fi
-done
-
diff --git a/zsh/.zshenv b/zsh/.zshenv
deleted file mode 120000
index 9fbf4d2..0000000
--- a/zsh/.zshenv
+++ /dev/null
@@ -1 +0,0 @@
-.config/zsh/.zshenv
\ No newline at end of file
diff --git a/zsh/.zshenv b/zsh/.zshenv
new file mode 100755
index 0000000..ac043fe
--- /dev/null
+++ b/zsh/.zshenv
@@ -0,0 +1,24 @@
+##!/bin/zsh
+#
+# .zshenv - Zsh environment file, loaded always.
+#
+
+# Set ZDOTDIR if you want to re-home Zsh.
+export XDG_CONFIG_HOME=${XDG_CONFIG_HOME:-$HOME/.config}
+export XDG_DATA_HOME=${XDG_DATA_HOME:-$HOME/.local/share}
+export XDG_CACHE_HOME=${XDG_CACHE_HOME:-$HOME/.cache}
+export ZDOTDIR=${ZDOTDIR:-$XDG_CONFIG_HOME/zsh}
+
+# Ensure path arrays do not contain duplicates.
+typeset -gU path fpath
+
+# Set the list of directories that zsh searches for commands.
+path=(
+  $HOME/{,s}bin(N)
+  $HOME/.local/{,s}bin(N)
+  /opt/{homebrew,local}/{,s}bin(N)
+  /usr/local/{,s}bin(N)
+  $path
+)
+
+. "$HOME/.cargo/env"
diff --git a/zsh/.zshrc b/zsh/.zshrc
new file mode 100755
index 0000000..8734542
--- /dev/null
+++ b/zsh/.zshrc
@@ -0,0 +1,18 @@
+#!/bin/bash
+#      ^----- get shellcheck hints based on bash
+# https://github.com/koalaman/shellcheck/issues/809
+# shellcheck disable=SC1090 # sourced filenames with variables
+echo "Loading ~/.zshrc"
+
+# Download Znap, if it's not there yet.
+[[ -r ~/.zsh_repos/znap/znap.zsh ]] ||
+    git clone --depth 1 -- \
+        https://github.com/marlonrichert/zsh-snap.git ~/.zsh_repos/znap
+source ~/.zsh_repos/znap/znap.zsh  # Start Znap
+
+znap eval starship 'starship init zsh --print-full-init'
+znap prompt
+
+znap source marlonrichert/zsh-autocomplete
+znap source zsh-users/zsh-autosuggestions
+
-- 
cgit v1.2.3