Add direnv support

This commit is contained in:
Loic Nageleisen 2021-07-06 15:01:05 +02:00
parent d52e1d1f82
commit 52e20aca38
Signed by: lloeki
GPG key ID: 971B4D9F125CD31E
5 changed files with 28 additions and 0 deletions

View file

@ -4,6 +4,8 @@
# Hooks # Hooks
# derived from http://glyf.livejournal.com/63106.html # derived from http://glyf.livejournal.com/63106.html
# TODO: support precmd_functions and chpwd_functions arrays
# default: NOOPs # default: NOOPs
function preexec { :; } function preexec { :; }
function precmd { :; } function precmd { :; }

View file

@ -20,6 +20,7 @@ GIT_PS1_SHOWUNTRACKEDFILES=1
precmd() { precmd() {
LAST_CMD_RC=$? LAST_CMD_RC=$?
_direnv_hook
#clear_incomplete_line #clear_incomplete_line
set_prompt set_prompt
update_terminal_cwd update_terminal_cwd

21
shell/direnv Executable file
View file

@ -0,0 +1,21 @@
if command -v direnv 2>&1 >/dev/null; then
if [[ -n $BASH_VERSION ]]; then
# eval "$(direnv hook bash)"
_direnv_hook() {
local previous_exit_status=$?;
trap -- '' SIGINT;
eval "$("${HOME}/.nix-profile/bin/direnv" export bash)";
trap - SIGINT;
return $previous_exit_status;
};
fi
if [[ -n $ZSH_VERSION ]]; then
# eval "$(direnv hook zsh)"
_direnv_hook() {
trap -- '' SIGINT;
eval "$("${HOME}/.nix-profile/bin/direnv" export zsh)";
trap - SIGINT;
}
fi
fi

View file

@ -5,4 +5,6 @@
#export DOCKER_CERT_PATH="/Users/lloeki/.docker/machine/machines/default" #export DOCKER_CERT_PATH="/Users/lloeki/.docker/machine/machines/default"
#export DOCKER_MACHINE_NAME="default" #export DOCKER_MACHINE_NAME="default"
export DOCKER_HOST=ssh://172.16.50.2
# vim: ft=bash # vim: ft=bash

2
zsh/rc
View file

@ -13,6 +13,7 @@ source $DOTFILES_ZSH_DIR/completion
source $DOTFILES_ZSH_DIR/prompt source $DOTFILES_ZSH_DIR/prompt
source $DOTFILES_ZSH_DIR/fzf source $DOTFILES_ZSH_DIR/fzf
source $DOTFILES_SHELL_DIR/go source $DOTFILES_SHELL_DIR/go
source $DOTFILES_SHELL_DIR/direnv
set -o ignoreeof set -o ignoreeof
unsetopt BEEP unsetopt BEEP
@ -24,6 +25,7 @@ GIT_PS1_SHOWUNTRACKEDFILES=1
precmd() { precmd() {
LAST_CMD_RC=$? LAST_CMD_RC=$?
_direnv_hook
psvar=() psvar=()
set_prompt set_prompt
set_term_title set_term_title