From e7db262806acb715b0f01fc60769f9089a36dadf Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Mon, 19 Sep 2022 16:29:04 -0400 Subject: [PATCH] Moved core.zsh to .profile --- .local/dotfiles/environment/core.zsh | 34 ++++++++++++++-------------- .profile | 4 ++++ .zshenv | 4 ++++ 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/.local/dotfiles/environment/core.zsh b/.local/dotfiles/environment/core.zsh index 0a90f66..5d08d6d 100644 --- a/.local/dotfiles/environment/core.zsh +++ b/.local/dotfiles/environment/core.zsh @@ -1,20 +1,20 @@ -case `uname` in - Linux) - EDITOR=nvim - SUDO_EDITOR=nvim - VISUAL=nvim - ;; - Darwin) - EDITOR=nvim - SUDO_EDITOR=nvim - VISUAL=nvim - ;; -esac +#case `uname` in +# Linux) +# EDITOR=/usr/bin/nvim +# SUDO_EDITOR=/usr/bin/nvim +# VISUAL=/usr/bin/nvim +# ;; +# Darwin) +# EDITOR=nvim +# SUDO_EDITOR=nvim +# VISUAL=nvim +# ;; +#esac # Default Environment -export EDITOR -export VISUAL -export PAGER=less -#export VIMINIT=":set runtimepath^=$HOME/.SpaceVim|:source $HOME/.SpaceVim/vimrc" -#export SPACEVIMDIR="$HOME/.SpaceVim.d/" +#export EDITOR +#export VISUAL +#export PAGER=less +##export VIMINIT=":set runtimepath^=$HOME/.SpaceVim|:source $HOME/.SpaceVim/vimrc" +##export SPACEVIMDIR="$HOME/.SpaceVim.d/" diff --git a/.profile b/.profile index 28b7425..2acddcb 100644 --- a/.profile +++ b/.profile @@ -6,6 +6,7 @@ case `uname` in Linux) EDITOR=/usr/bin/nvim SUDO_EDITOR=/usr/bin/nvim + SYSTEMD_EDITOR=/usr/bin/nvim VISUAL=/usr/bin/nvim if [[ -x "/usr/lib/ssh/gnome-ssh-askpass3" ]]; then SSH_ASKPASS=/usr/lib/ssh/gnome-ssh-askpass3 @@ -17,6 +18,9 @@ case `uname` in EDITOR=nvim SUDO_EDITOR=nvim VISUAL=nvim + if [[ -r "/usr/local/bin/lesspipe.sh" ]]; then + export LESSOPEN="|/usr/local/bin/lesspipe.sh %s" + fi ;; esac diff --git a/.zshenv b/.zshenv index 6482b8f..23b925f 100644 --- a/.zshenv +++ b/.zshenv @@ -7,6 +7,10 @@ : ${ZIM_HOME=${ZDOTDIR:-${HOME}}/.zim} # }}} End configuration added by Zim install +if [[ -r "$HOME/.profile" ]]; then + . "$HOME/.profile" +fi + if [[ -r "$HOME/.cargo/env" ]]; then . "$HOME/.cargo/env" fi