From 4f5c8d81378f3cc224c3aa50e98f60502459c21f Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Tue, 10 May 2022 16:12:10 +0200
Subject: machines/sternenseemann: enable direnv for bash as well

Move into base-laptop since I'll want this in workstation-esque
environments going forward.
---
 machines/sternenseemann/base-laptop.nix | 5 +++++
 machines/sternenseemann/wolfgang.nix    | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'machines')

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
-- 
cgit 1.4.1