From 2d896e1555a697b19b1f25987efd65d6b0ef4c0d Mon Sep 17 00:00:00 2001
From: Eryn Wells <eryn@erynwells.me>
Date: Fri, 31 Dec 2021 12:00:16 -0800
Subject: [PATCH] [zsh] Update shell init: profile

---
 profile                     | 10 ----------
 zprofile                    | 30 +++++++++---------------------
 zsh/func/list_tmux_sessions | 16 ++++++++++++++++
 3 files changed, 25 insertions(+), 31 deletions(-)
 delete mode 100644 profile
 create mode 100644 zsh/func/list_tmux_sessions

diff --git a/profile b/profile
deleted file mode 100644
index f3660a4..0000000
--- a/profile
+++ /dev/null
@@ -1,10 +0,0 @@
-# .profile
-# vim: ft=zsh
-# Eryn Wells <eryn@erynwells.me>
-
-# Start SSH agent for password-less logins
-if [ -z "$SSH_AUTH_SOCK" -a -x "$SSHAGENT" ]; then
-    print_info -l 1 'Starting ssh-agent'
-    eval `ssh-agent -s`
-    trap "kill $SSH_AGENT_PID" 0
-fi
diff --git a/zprofile b/zprofile
index 7b917b6..0646044 100644
--- a/zprofile
+++ b/zprofile
@@ -1,27 +1,15 @@
-# .zprofile
-# vim:ft=zsh
-#
-# Login shell setup
-#
+#!/usr/bin/env zsh
 # Eryn Wells <eryn@erynwells.me>
 
-print_heading -l 1 'Initializing login shell'
+shell-log 'Initializing Login Environment'
 
-[ -e $HOME/.profile ] && source $HOME/.profile
-
-list_tmux_sessions()
-{
-    tmux_out=`tmux list-sessions 2>/dev/null`
-    [[ -z "$tmux_out" || -n "$TMUX" ]] && return
-
-    echo "You have the following active tmux sessions:"
-    for session in ${(f)tmux_out}; do
-        echo "    $session"
-    done
-    echo
-}
+# Start SSH agent for password-less logins
+if [ -z "$SSH_AUTH_SOCK" -a -x "$SSHAGENT" ]; then
+    print_info -l 1 'Starting ssh-agent'
+    eval `ssh-agent -s`
+    trap "kill $SSH_AGENT_PID" 0
+fi
 
+autoload list_tmux_sessions
 list_tmux_sessions
 
-[ -e $HOME/.profile.$SYS ] && source $HOME/.profile.$SYS
-[ -e $HOME/.profile.local ] && source $HOME/.profile.local
diff --git a/zsh/func/list_tmux_sessions b/zsh/func/list_tmux_sessions
new file mode 100644
index 0000000..d0b9f06
--- /dev/null
+++ b/zsh/func/list_tmux_sessions
@@ -0,0 +1,16 @@
+#!/usr/bin/env zsh
+# Eryn Wells <eryn@erynwells.me>
+
+function list_tmux_session
+{
+    local tmux_out=`tmux list-sessions 2>/dev/null`
+    [[ -z "$tmux_out" || -n "$TMUX" ]] && return
+
+    echo "You have the following active tmux sessions:"
+    for session in ${(f)tmux_out}; do
+        echo "    $session"
+    done
+    echo
+}
+
+list_tmux_session "$@"