diff options
| -rw-r--r-- | config/emacs/emacs.d/init.el | 1 | ||||
| -rw-r--r-- | config/emacs/emacs.d/lisp/init-direnv.el | 12 | ||||
| -rwxr-xr-x | config/shell/bashrc | 2 | ||||
| -rw-r--r-- | config/shell/zshrc | 2 | ||||
| -rw-r--r-- | overlays/emacs/packages.nix | 1 | ||||
| -rw-r--r-- | packages.nix | 1 |
6 files changed, 19 insertions, 0 deletions
diff --git a/config/emacs/emacs.d/init.el b/config/emacs/emacs.d/init.el index 05ea8365..e8d9ccdf 100644 --- a/config/emacs/emacs.d/init.el +++ b/config/emacs/emacs.d/init.el @@ -93,6 +93,7 @@ (require 'init-pcomplete) ;; Languages and Language Modes +(require 'init-direnv) (require 'init-semantic) (require 'init-lsp) (require 'init-dap) diff --git a/config/emacs/emacs.d/lisp/init-direnv.el b/config/emacs/emacs.d/lisp/init-direnv.el new file mode 100644 index 00000000..cd9d64b6 --- /dev/null +++ b/config/emacs/emacs.d/lisp/init-direnv.el @@ -0,0 +1,12 @@ +;;; init-direnv --- direnv configuration and setup +;;; Commentary: +;;; Code: + +(defvar direnv) + +(use-package direnv + :config + (direnv-mode)) + +(provide 'init-direnv) +;;; init-direnv.el ends here diff --git a/config/shell/bashrc b/config/shell/bashrc index 34074866..b0fb7705 100755 --- a/config/shell/bashrc +++ b/config/shell/bashrc @@ -32,3 +32,5 @@ else export EDITOR='emacsclient' export VISUAL='emacsclient' fi + +eval "$(direnv hook bash)" diff --git a/config/shell/zshrc b/config/shell/zshrc index d66df7b4..cfbc268a 100644 --- a/config/shell/zshrc +++ b/config/shell/zshrc @@ -52,3 +52,5 @@ rprompt_precmd() { fi } precmd_functions+=(rprompt_precmd) + +eval "$(direnv hook zsh)" diff --git a/overlays/emacs/packages.nix b/overlays/emacs/packages.nix index b54f6efc..35dbfc27 100644 --- a/overlays/emacs/packages.nix +++ b/overlays/emacs/packages.nix @@ -64,6 +64,7 @@ in rec { define-word diff-hl diminish + direnv disable-mouse docker docker-compose-mode diff --git a/packages.nix b/packages.nix index 49f1bfd9..470007d0 100644 --- a/packages.nix +++ b/packages.nix @@ -24,6 +24,7 @@ with pkgs; [ dos2unix dot2tex duplicity + direnv elm-environment emacs-overlay enchant |