From ad4e66377071301ef6097d62b2fbebee876d858e Mon Sep 17 00:00:00 2001
From: tavo <tavo@tavo.one>
Date: Thu, 4 Sep 2025 21:07:11 -0600
Subject: [PATCH] shellcheck and faster startup

---
 shell/profile.d/nvm.sh       |  7 ++++++-
 shell/profile.d/path.sh      | 16 ---------------
 shell/profile.d/pyv.sh       |  8 --------
 shell/profile.d/shortcuts.sh |  9 ---------
 shell/profile.d/xdgspec.sh   | 39 ------------------------------------
 5 files changed, 6 insertions(+), 73 deletions(-)
 delete mode 100644 shell/profile.d/path.sh
 delete mode 100644 shell/profile.d/pyv.sh
 delete mode 100644 shell/profile.d/shortcuts.sh
 delete mode 100644 shell/profile.d/xdgspec.sh

diff --git a/shell/profile.d/nvm.sh b/shell/profile.d/nvm.sh
index b820e23..e552142 100644
--- a/shell/profile.d/nvm.sh
+++ b/shell/profile.d/nvm.sh
@@ -3,5 +3,10 @@
 export NVM_DIR="$HOME/.config/nvm"
 
 if [ -s "$NVM_DIR/nvm.sh" ]; then
-  . "$NVM_DIR/nvm.sh"
+  # nvm.sh is a very large file that causes shell startup to slow
+  # down, this wrapper sources nvm.sh only after calling nvm.
+  nvm() {
+    . "$NVM_DIR/nvm.sh"
+    nvm "$@"
+  }
 fi
diff --git a/shell/profile.d/path.sh b/shell/profile.d/path.sh
deleted file mode 100644
index e92b8b3..0000000
--- a/shell/profile.d/path.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# shellcheck disable=SC2123
-
-PATH="$HOME/.config/scripts/status${PATH:+:${PATH}}"
-PATH="$HOME/.config/scripts/menu${PATH:+:${PATH}}"
-PATH="$HOME/.config/scripts/menu/xclipmenu${PATH:+:${PATH}}"
-PATH="$HOME/.config/scripts/sway${PATH:+:${PATH}}"
-PATH="$HOME/.config/scripts/dwm${PATH:+:${PATH}}"
-PATH="$HOME/.config/wrappers${PATH:+:${PATH}}"
-PATH="$HOME/.config/scripts${PATH:+:${PATH}}"
-PATH="$HOME/.local/bin${PATH:+:${PATH}}"
-PATH="$HOME/.local/state/nix/profile/bin${PATH:+:${PATH}}"
-PATH="$HOME/.config/emacs/bin${PATH:+:${PATH}}"
-PATH="$HOME/.local/share/go/bin${PATH:+:${PATH}}"
-PATH="/usr/local/go/bin${PATH:+:${PATH}}"
-PATH="$HOME/.local/share/pyenv/shims${PATH:+:${PATH}}"
diff --git a/shell/profile.d/pyv.sh b/shell/profile.d/pyv.sh
deleted file mode 100644
index 460f43e..0000000
--- a/shell/profile.d/pyv.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-for f in pyv pyv_comp.bash; do
-  if [ -f ~/.local/share/pyv/$f ]; then
-    # shellcheck disable=SC1090
-    . ~/.local/share/pyv/$f
-  fi
-done
diff --git a/shell/profile.d/shortcuts.sh b/shell/profile.d/shortcuts.sh
deleted file mode 100644
index 928f786..0000000
--- a/shell/profile.d/shortcuts.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-export \
-  FJ="git@git.tavo.one:tavo" \
-  GL="git@gitlab.com:tavo-wasd" \
-  GH="git@github.com:tavo-wasd-gh" \
-  DRIVE="ssh://drive:/home/drive/drive" \
-  BOOKMARKS="$HOME/Documents/bookmarks" \
-  BIB="$HOME/Documents/bibliography"
diff --git a/shell/profile.d/xdgspec.sh b/shell/profile.d/xdgspec.sh
deleted file mode 100644
index a6638ab..0000000
--- a/shell/profile.d/xdgspec.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-export \
-  XDG_STATE_HOME="$HOME/.local/state" \
-  XDG_CACHE_HOME="$HOME/.local/cache" \
-  XDG_DATA_HOME="$HOME/.local/share" \
-  XDG_CONFIG_HOME="$HOME/.config"
-
-export \
-  _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME/java" \
-  MATHEMATICA_USERBASE="$XDG_CONFIG_HOME/mathematica" \
-  XCURSOR_PATH=/usr/share/icons:"$XDG_DATA_HOME"/icons \
-  GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/gtkrc-2.0" \
-  PASSWORD_STORE_DIR="$XDG_DATA_HOME/password-store" \
-  TEXMFCONFIG="$XDG_CONFIG_HOME/texlive/texmf-config" \
-  TEXMFVAR="$XDG_CACHE_HOME/texlive/texmf-var" \
-  TEXMFHOME="$XDG_DATA_HOME/texmf" \
-  VIMINIT="source $XDG_CONFIG_HOME/vim/vimrc" \
-  XSERVERRC="$XDG_CONFIG_HOME/X11/xserverrc" \
-  MBSYNCRC="$XDG_CONFIG_HOME/isync/mbsyncrc" \
-  XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" \
-  XINITRC="$XDG_CONFIG_HOME/X11/xinit/xinitrc" \
-  LESSHISTFILE="$XDG_DATA_HOME/lesshst" \
-  ELECTRUMDIR="$XDG_DATA_HOME/electrum" \
-  CUDA_CACHE_PATH="$XDG_CACHE_HOME/nv" \
-  WINEPREFIX="$XDG_DATA_HOME/wine" \
-  WGETRC="$XDG_CONFIG_HOME/wget/wgetrc" \
-  GNUPGHOME="$XDG_DATA_HOME/gnupg" \
-  GOPATH="$XDG_DATA_HOME/go" \
-  SSH_CONFIG="-F ${XDG_CONFIG_HOME}/ssh/config" \
-  GIT_SSH_COMMAND="ssh -F ${XDG_CONFIG_HOME}/ssh/config" \
-  ZDOTDIR="$XDG_CONFIG_HOME/shell" \
-  NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc" \
-  IPYTHONDIR="$XDG_CONFIG_HOME/ipython" \
-  PYENV_ROOT="$XDG_DATA_HOME/pyenv" \
-  PYTHON_HISTORY="$XDG_CACHE_HOME/python_history" \
-  SQLITE_HISTORY="$XDG_CACHE_HOME/sqlite_history" \
-  PGPASSFILE="$XDG_CONFIG_HOME/pg/pgpass" \
-  UNISON="$XDG_DATA_HOME"/unison