diff --git a/flake.nix b/flake.nix
index 949417e..13b7aa1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,6 +20,7 @@
 
       perSystem = {
         inputs',
+        self',
         pkgs,
         lib,
         ...
@@ -32,6 +33,15 @@
           ];
         };
 
+        packages.base-packages = pkgs.symlinkJoin {
+          name = "settei-base";
+          paths = with self'.packages; [
+            helix
+            fish
+            git-commit-last
+          ];
+        };
+
         formatter = pkgs.alejandra;
       };
     };
diff --git a/wrappers/default.nix b/wrappers/default.nix
index e782baa..e648250 100644
--- a/wrappers/default.nix
+++ b/wrappers/default.nix
@@ -30,19 +30,11 @@
       inherit (fish-base) name meta passthru;
       paths = [fish-wrapped fish-base];
     };
-
-    base-packages = pkgs.symlinkJoin {
-      name = "settei-base";
-      paths = [
-        all-packages.helix
-        fish
-      ];
-    };
   in {
     packages =
       all-packages
       // {
-        inherit base-packages fish;
+        inherit fish;
       };
   };
 }