diff --git a/flake.nix b/flake.nix
index fcdf15c..e0fd33c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,15 +25,12 @@
       ...
     }:
     let
+      # TODO: merge overlays into a list
       bindingsOverlay = import ./nix/overlays/bindings.nix;
       coreOverlay = (final: prev: {
         p2prc = final.callPackage ./. { };
       });
     in
-    {
-      # overlays.default = bindingsOverlay;
-    }
-    //
     (flake-utils.lib.eachDefaultSystem (
         system:
           let
@@ -70,6 +67,7 @@
             };
 
             overlays = {
+              # TODO: merge all overlays into a single one
               default = coreOverlay;
               bindings = bindingsOverlay;
             };
diff --git a/nix/templates/haskell/flake.nix b/nix/templates/haskell/flake.nix
index a4d2b21..c1c4281 100644
--- a/nix/templates/haskell/flake.nix
+++ b/nix/templates/haskell/flake.nix
@@ -23,6 +23,8 @@
       let
         pkgs = import nixpkgs {
           inherit system;
+
+          # TODO: p2prc overlays into a single list
           overlays = [
             p2prc-flake.overlays.${system}.default
             p2prc-flake.overlays.${system}.bindings
@@ -38,34 +40,38 @@
             cabal-install
           ];
           text = ''
-            if [ -f *.cabal ]; then echo "The file exists"; fi
+            # TODO: add this check
+            # if [ -f *.cabal ]; then echo "The file exists"; fi
             cabal init
             echo "RUNNING"
             cabal2nix . > ./project.nix;
+            git add .
           '';
         };
 
       in {
-        package = {
-          # default = pkgs.haskellPackages.callPackage ./project.nix { };
+        packages = {
+          # TODO: fix issue
+          default = pkgs.haskellPackages.callPackage ./project.nix { };
           init = initProject;
         };
 
-        # devShell.default = pkgs.mkShell {
-        #   packages = with pkgs; [
-        #     # cabal2nix
-        #     # cabal-install
-        #   ];
-        #
-        #   buildInputs = [
-        #     # p2prc-flake.packages.${system}.default
-        #     initProject
-        #   ];
-        #
-        #   shellHook = ''
-        #     echo "creating a new development shell"
-        #   '';
-        # };
+        # TODO: override haskell binding lib devshell
+        devShells.default = pkgs.mkShell {
+          packages = with pkgs; [
+            cabal2nix
+            cabal-install
+          ];
+
+          buildInputs = [
+            p2prc-flake.packages.${system}.default
+            initProject
+          ];
+
+          shellHook = ''
+            cabal2nix . > ./project.nix;
+          '';
+        };
       }
     ));