summary refs log tree commit diff stats
path: root/user
diff options
context:
space:
mode:
Diffstat (limited to 'user')
-rw-r--r--user/emacs/init.el7
-rw-r--r--user/settings/emacs.nix1
-rw-r--r--user/settings/neovim.nix1
3 files changed, 9 insertions, 0 deletions
diff --git a/user/emacs/init.el b/user/emacs/init.el
index b73bf0d3..ea2337e0 100644
--- a/user/emacs/init.el
+++ b/user/emacs/init.el
@@ -938,6 +938,12 @@ _p_rev       _u_pper              _=_: upper/lower       _r_esolve
                      "s s" #'counsel-projectile-rg
                      "s r" #'counsel-projectile-rg))
 
+(use-package envrc
+  :defer 2
+  :after projectile
+  :config (progn
+            (envrc-global-mode)))
+
 (use-package magit
   :defer 5
   :commands (magit-status magit-dispatch)
@@ -1174,6 +1180,7 @@ _p_rev       _u_pper              _=_: upper/lower       _r_esolve
   "br" #'revert-buffer
   "bk" #'kill-buffer
   "dd" #'dired
+  "e" '(:keymap envrc-command-map :package envrc)
   "fs" #'save-buffer
   "ff" #'find-file
   "fw" #'write-file
diff --git a/user/settings/emacs.nix b/user/settings/emacs.nix
index 74a0d41a..acef1842 100644
--- a/user/settings/emacs.nix
+++ b/user/settings/emacs.nix
@@ -95,6 +95,7 @@ in
         crux
         ctrlf
         dired-git-info
+        envrc
         editorconfig
         eglot
         eldoc-box
diff --git a/user/settings/neovim.nix b/user/settings/neovim.nix
index e238b916..4fd58b11 100644
--- a/user/settings/neovim.nix
+++ b/user/settings/neovim.nix
@@ -14,6 +14,7 @@
       coc-json
       coc-tabnine
       coc-yaml
+      direnv-vim
       vim-surround
     ];
     extraLuaConfig = builtins.readFile ../nvim/init.lua;