diff options
Diffstat (limited to 'Common')
| -rw-r--r-- | Common/bashrc.m4 | 8 | ||||
| -rw-r--r-- | Common/zshrc.m4 | 9 |
2 files changed, 8 insertions, 9 deletions
diff --git a/Common/bashrc.m4 b/Common/bashrc.m4 index 6f64138..2340348 100644 --- a/Common/bashrc.m4 +++ b/Common/bashrc.m4 @@ -12,9 +12,9 @@ esac # Check if env setup file exists if [ ! -f ~/.dotfiles_env ]; then echo "DEFAULT_USER=$USER" >> ~/.zsh_env_setup - echo "export GIT_EDITOR=\"DEFAULT_EDITOR\"" >> ~/.dotfiles_env - echo "export GIT_AUTHOR_NAME=\"GIT_USER\"" >> ~/.dotfiles_env - echo "export GIT_AUTHOR_EMAIL=\"GIT_EMAIL\"" >> ~/.dotfiles_env + echo "export GIT_EDITOR=\"DT_EDITOR\"" >> ~/.dotfiles_env + echo "export GIT_AUTHOR_NAME=\"DT_GIT_USER\"" >> ~/.dotfiles_env + echo "export GIT_AUTHOR_EMAIL=\"DT_GIT_EMAIL\"" >> ~/.dotfiles_env fi # Source env setup file @@ -28,7 +28,7 @@ export LC_ALL=en_US.UTF-8 export LANG=en_US.UTF-8 # Set editor -export EDITOR="DEFAULT_EDITOR" +export EDITOR="DT_EDITOR" # don't put duplicate lines or lines starting with space in the history. # See bash(1) for more options diff --git a/Common/zshrc.m4 b/Common/zshrc.m4 index 2cafd8e..36e2857 100644 --- a/Common/zshrc.m4 +++ b/Common/zshrc.m4 @@ -1,4 +1,3 @@ -m4_include(`system.m4')m4_dnl # Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc. # Initialization code that may require console input (password prompts, [y/n] # confirmations, etc.) must go above this block; everything else may go below. @@ -14,9 +13,9 @@ export KEYTIMEOUT=1 if [ ! -f ~/.dotfiles_env ]; then echo "export ZSH=$HOME/.oh-my-zsh" > ~/.dotfiles_env echo "DEFAULT_USER=$USER" >> ~/.dotfiles_env - echo "export GIT_EDITOR=\"DEFAULT_EDITOR\"" >> ~/.dotfiles_env - echo "export GIT_AUTHOR_NAME=\"GIT_USER\"" >> ~/.dotfiles_env - echo "export GIT_AUTHOR_EMAIL=\"GIT_EMAIL\"" >> ~/.dotfiles_env + echo "export GIT_EDITOR=\"DT_EDITOR\"" >> ~/.dotfiles_env + echo "export GIT_AUTHOR_NAME=\"DT_GIT_USER\"" >> ~/.dotfiles_env + echo "export GIT_AUTHOR_EMAIL=\"DT_GIT_EMAIL\"" >> ~/.dotfiles_env fi # Source env setup file @@ -60,7 +59,7 @@ export LC_ALL=en_US.UTF-8 export LANG=en_US.UTF-8 # Set editor -export EDITOR="DEFAULT_EDITOR" +export EDITOR="DT_EDITOR" # Enable vim keybindings (This is enabled using zsh-vi-mode now. # bindkey -v |