diff --git a/home-manager/machines.nix b/home-manager/machines.nix
index cc23c24a..3868bfd8 100644
--- a/home-manager/machines.nix
+++ b/home-manager/machines.nix
@@ -64,7 +64,7 @@ let
         ./roles/git-sign.nix
         ./roles/gnome.nix
         ./roles/status-script.nix
-        ./roles/hoogle.nix
+        ./roles/haskell-env.nix
         ./roles/terminal.nix
         ./roles/mpclient.nix
         ./roles/mpd.nix
diff --git a/home-manager/roles/default.nix b/home-manager/roles/default.nix
index 91a3c48c..0c4fdda7 100644
--- a/home-manager/roles/default.nix
+++ b/home-manager/roles/default.nix
@@ -146,7 +146,6 @@
           magic-wormhole
           alejandra
           nix-top
-          ghcWithPackages
           ghcid
           matrix-commander
           upterm
diff --git a/home-manager/roles/hoogle.nix b/home-manager/roles/haskell-env.nix
similarity index 86%
rename from home-manager/roles/hoogle.nix
rename to home-manager/roles/haskell-env.nix
index 1ef0e915..35dfd697 100644
--- a/home-manager/roles/hoogle.nix
+++ b/home-manager/roles/haskell-env.nix
@@ -7,4 +7,5 @@
       Restart = "always";
     };
   };
+  home.packages = [pkgs.ghcWithPackages];
 }
diff --git a/overlays/ghc/default.nix b/overlays/ghc/default.nix
index 67c9dbd8..00a6f96d 100644
--- a/overlays/ghc/default.nix
+++ b/overlays/ghc/default.nix
@@ -1,7 +1,6 @@
 final: _: let
   myPkgs = import ./packages.nix;
 in {
-  myHaskellPackages = myPkgs.makeHaskellPackages final.unstableHaskellPackages;
   myHaskellScriptPackages = myPkgs.makeHaskellScriptPackages final.haskellPackages;
-  ghcWithPackages = final.unstableGhc.withHoogle (p: builtins.attrValues (myPkgs.makeHaskellPackages p));
+  ghcWithPackages = final.unstableGhc.withHoogle (p: builtins.attrValues (myPkgs.makeHaskellPackages p // (final.flake-inputs.self.overlays.addMyHaskellPackages "" "")));
 }
diff --git a/packages/.envrc b/packages/.envrc
deleted file mode 100644
index 8e44d2ba..00000000
--- a/packages/.envrc
+++ /dev/null
@@ -1 +0,0 @@
-use flake ..#haskell
diff --git a/packages/flake-module.nix b/packages/flake-module.nix
index c26eed1f..188e1036 100644
--- a/packages/flake-module.nix
+++ b/packages/flake-module.nix
@@ -86,13 +86,5 @@ in {
   };
   perSystem = {config, ...}: {
     inherit packages;
-    devShells.haskell = hpkgs.shellFor {
-      packages = hpkgs: (builtins.attrValues (selectHaskellPackages hpkgs));
-      shellHook = config.pre-commit.installationScript;
-      buildInputs = [
-        hpkgs.haskell-language-server
-        hpkgs.cabal-install
-      ];
-    };
   };
 }