From 81f56d2e6e79fc095d5b020b0fa97f38eef79def Mon Sep 17 00:00:00 2001 From: Michael Taron Date: Tue, 28 May 2024 09:33:44 -0700 Subject: [PATCH] remove .profile didn't realize it was just for x.org --- home/private_dot_profile.tmpl | 36 ---------------------------------- home/private_dot_zshenv.tmpl | 37 ++++++++++++++++++++++++++++++++--- 2 files changed, 34 insertions(+), 39 deletions(-) delete mode 100644 home/private_dot_profile.tmpl diff --git a/home/private_dot_profile.tmpl b/home/private_dot_profile.tmpl deleted file mode 100644 index 145d9bc..0000000 --- a/home/private_dot_profile.tmpl +++ /dev/null @@ -1,36 +0,0 @@ -# This file is executed automatically during start-up. Log in and out required to reapply. -# Variables defined here are available to shells and GUI applications. -# https://help.ubuntu.com/community/EnvironmentVariables#A.2BAH4-.2F.profile - -# XDG base directories -# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html -export XDG_CONFIG_HOME="$HOME/.config" -export XDG_DATA_HOME="$HOME/.local/share" -export XDG_CACHE_HOME="$HOME/.cache" -export XDG_BIN_DIR="$HOME/.local/bin" - -export GNUPGHOME="$XDG_DATA_HOME/gnupg" -export LESSHISTFILE="$XDG_DATA_HOME/less/history" - -export VISUAL=code - -# Color man pages with bat -# https://github.com/sharkdp/bat#man -export MANPAGER="sh -c 'col -bx | bat -l man -p'" -export MANROFFOPT="-c" -export PAGER='less --quit-if-one-screen --mouse' - -{{ if and (eq .chezmoi.os "linux") (not .headless) -}} -export VSCODE_PORTABLE="$XDG_CONFIG_HOME/vscode" -{{- end }} -{{ if lookPath "ipython" -}} -export IPYTHONDIR="$XDG_CONFIG_HOME/ipython" -{{- end }} -{{ if lookPath "jupyter" -}} -export JUPYTER_CONFIG_DIR="$XDG_CONFIG_HOME/jupyter" -{{- end }} - -# https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-tool-install -[[ -d "$HOME/.dotnet/tools" ]] && PATH="$HOME/.dotnet/tools:$PATH" - -export PATH="$XDG_BIN_DIR:$PATH" diff --git a/home/private_dot_zshenv.tmpl b/home/private_dot_zshenv.tmpl index d31e051..cdeeec4 100644 --- a/home/private_dot_zshenv.tmpl +++ b/home/private_dot_zshenv.tmpl @@ -1,8 +1,39 @@ -{{ if or .headless (eq .chezmoi.os "darwin") -}} -# On MacOS .profile is not read by the OS, so running it here. -source "$HOME/.profile" +# XDG base directories +# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html +export XDG_CONFIG_HOME="$HOME/.config" +export XDG_DATA_HOME="$HOME/.local/share" +export XDG_CACHE_HOME="$HOME/.cache" +export XDG_BIN_DIR="$HOME/.local/bin" + +export GNUPGHOME="$XDG_DATA_HOME/gnupg" +export LESSHISTFILE="$XDG_DATA_HOME/less/history" + +export VISUAL=code + +{{ if lookPath "bat" -}} +# Color man pages with bat +# https://github.com/sharkdp/bat#man +export MANPAGER="sh -c 'col -bx | bat -l man -p'" +export MANROFFOPT="-c" {{- end }} +export PAGER='less --quit-if-one-screen --mouse' + +{{ if and (eq .chezmoi.os "linux") (not .headless) -}} +export VSCODE_PORTABLE="$XDG_CONFIG_HOME/vscode" +{{- end }} +{{ if lookPath "ipython" -}} +export IPYTHONDIR="$XDG_CONFIG_HOME/ipython" +{{- end }} +{{ if lookPath "jupyter" -}} +export JUPYTER_CONFIG_DIR="$XDG_CONFIG_HOME/jupyter" +{{- end }} + +# https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-tool-install +[[ -d "$HOME/.dotnet/tools" ]] && PATH="$HOME/.dotnet/tools:$PATH" + +export PATH="$XDG_BIN_DIR:$PATH" + # zsh paths export ZDOTDIR="${XDG_CONFIG_HOME:-$HOME/.config}/zsh" export HISTFILE="$ZDOTDIR/.zsh_history"