about summary refs log tree commit diff
path: root/machines/sternenseemann
diff options
context:
space:
mode:
authorsternenseemann <sternenseemann@systemli.org>2022-05-10 16:12:10 +0200
committersternenseemann <sternenseemann@systemli.org>2022-05-10 16:12:10 +0200
commit4f5c8d81378f3cc224c3aa50e98f60502459c21f (patch)
tree29385c1e7c5a5e9aab412ec23c3aa4d1ed9b8ecf /machines/sternenseemann
parentcdc50993da22631700e0e6c856a1a7cd10eb92ac (diff)
machines/sternenseemann: enable direnv for bash as well
Move into base-laptop since I'll want this in workstation-esque
environments going forward.
Diffstat (limited to 'machines/sternenseemann')
-rw-r--r--machines/sternenseemann/base-laptop.nix5
-rw-r--r--machines/sternenseemann/wolfgang.nix1
2 files changed, 5 insertions, 1 deletions
diff --git a/machines/sternenseemann/base-laptop.nix b/machines/sternenseemann/base-laptop.nix
index 45b51135..c1197e95 100644
--- a/machines/sternenseemann/base-laptop.nix
+++ b/machines/sternenseemann/base-laptop.nix
@@ -51,6 +51,7 @@
         ffmpeg graphicsmagick
         pavucontrol
         emacs
+        direnv
       ] ++ pkgs.vuizvui.sternenseemann.scripts.default;
 
       variables = {
@@ -59,6 +60,10 @@
       };
     };
 
+    programs.bash.interactiveShellInit = ''
+      eval "$(direnv hook bash)"
+    '';
+
     # To accomodate old habits
     programs.fish.shellInit = ''
       alias nvim "emacsclient -n"
diff --git a/machines/sternenseemann/wolfgang.nix b/machines/sternenseemann/wolfgang.nix
index 70bda56e..7a3f2e97 100644
--- a/machines/sternenseemann/wolfgang.nix
+++ b/machines/sternenseemann/wolfgang.nix
@@ -66,7 +66,6 @@ in {
     vuizvui.sternenseemann.texlive jabref
     youtube-dl mpv spotify
     ghc cabal-install cabal2nix
-    direnv
     sbcl rlwrap
     valgrind gdb
     docker-compose