refactor overlays

flake.nix

@@ -42,12 +42,15 @@
     };
     determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/*";
     systems.url = "github:nix-systems/default";
+    jj-vine = {
+      url = "github:abrenneke/jj-vine";
+      flake = false;
+    };
   };
   outputs =
     {
       self,
       nixpkgs,
-      nixpkgs-stable,
       systems,
       ...
     }@inputs:
@@ -61,22 +64,21 @@
         config.allowUnfree = true;
         overlays = [
           inputs.nvim.overlays.default
-          (import ./pkgs/overlay.nix)
+          inputs.self.overlays.stable-packages
+          (import ./overlays { inherit inputs; })
         ];
       };
-      pkgs-stable = import nixpkgs-stable {
-        inherit system;
-        config.allowUnfree = true;
-      };
       eachSystem = f: nixpkgs.lib.genAttrs (import systems) (system: f nixpkgs.legacyPackages.${system});
       treefmtEval = eachSystem (pkgs: inputs.treefmt-nix.lib.evalModule pkgs ./treefmt.nix);
     in
     {
+      packages = eachSystem (pkgs: import ./pkgs { inherit inputs; });
+      overlays = import ./overlays { inherit inputs; };
+      formatter = eachSystem (pkgs: treefmtEval.${pkgs.system}.config.build.wrapper);
       nixosConfigurations = import ./nixos {
         inherit
           inputs
           pkgs
-          pkgs-stable
           attrs
           system
           ;
@@ -92,7 +94,6 @@
         };
       };
       deploy.nodes = import ./fleet.nix { inherit inputs self system; };
-      formatter = eachSystem (pkgs: treefmtEval.${pkgs.system}.config.build.wrapper);
       devShells.${system}.default = pkgs.mkShell {
         inherit (self.checks.pre-commit-check) shellHook;
         buildInputs = with pkgs; [