flake reorg

flake.nix

@@ -32,7 +32,10 @@
   in
     flake-utils.lib.eachDefaultSystem (
       system: let
-        overlays = [(import rust-overlay)];
+        overlays = [
+          (import rust-overlay)
+          (import ./overlay.nix)
+        ];
         pkgs = import nixpkgs {
           inherit system overlays;
           config.allowUnfree = true;
@@ -44,11 +47,8 @@
         hostTarget = pkgs.hostPlatform.config;
         cross-naersk' = callPackage cross-naersk {inherit naersk;};
 
-        src = sourceByRegex ./. ["Cargo.*" "(src)(/.*)?"];
-
         nearskOpt = {
-          pname = "haze";
+          inherit (pkgs.haze) src pname;
-          root = src;
         };
         buildTarget = target: (cross-naersk'.buildPackage target) nearskOpt;
         hostNaersk = cross-naersk'.hostNaersk;
@@ -57,7 +57,7 @@
         packages =
           genAttrs targets buildTarget
           // rec {
-            haze = packages.${hostTarget};
+            inherit (pkgs) haze;
             check = hostNaersk.buildPackage (nearskOpt
               // {
                 mode = "check";
@@ -81,7 +81,19 @@
       }
     )
     // {
+      overlays.default = import ./overlay.nix;
+      homeManagerModules.default = {
+        pkgs,
+        config,
+        lib,
+        ...
+      }: {
+        imports = [./hm-module.nix];
+        config = lib.mkIf config.programs.haze.enable {
+          nixpkgs.overlays = [self.overlays.default];
+          programs.haze.package = lib.mkDefault pkgs.haze;
+        };
+      };
       inherit targets releaseTargets;
-      homeManagerModule = import ./hm-module.nix self.packages;
     };
 }

hm-module.nix

@@ -1,4 +1,4 @@
-packages: {
+{
   config,
   lib,
   pkgs,
@@ -43,7 +43,6 @@ with lib; let
         };
       }
     ));
-  pkg = packages.${pkgs.system}.default;
 in {
   options.programs.haze = {
     enable = mkEnableOption "haze";
@@ -165,11 +164,17 @@ in {
         };
       });
     };
+
+    package = mkOption {
+      type = types.package;
+      defaultText = literalExpression "pkgs.haze";
+      description = "package to use";
+    };
   };
 
   config = mkIf cfg.enable {
     xdg.configFile."haze/haze.toml".source = configFile;
-    home.packages = [pkg];
+    home.packages = [cfg.package];
 
     systemd.user.services.haze = {
       Unit = {
@@ -177,7 +182,7 @@ in {
       };
 
       Service = {
-        ExecStart = "${pkg}/bin/haze proxy";
+        ExecStart = "${cfg.package}/bin/haze proxy";
         Restart = "on-failure";
         RestartSec = 10;
       };

overlay.nix

@@ -0,0 +1,3 @@
+final: prev: {
+  haze = final.callPackage ./package.nix {};
+}

package.nix

@@ -0,0 +1,23 @@
+{
+  stdenv,
+  rustPlatform,
+  libsodium,
+  pkg-config,
+  lib,
+}: let
+  inherit (lib.sources) sourceByRegex;
+  src = sourceByRegex ./. ["Cargo.*" "(src)(/.*)?"];
+in
+  rustPlatform.buildRustPackage rec {
+    pname = "haze";
+    version = "0.1.0";
+
+    inherit src;
+
+    cargoLock = {
+      lockFile = ./Cargo.lock;
+      outputHashes = {
+        "hyper-reverse-proxy-0.5.2-dev" = "sha256-8yBpYQZJaNhaecjR2GhQytRM4jgS0GaKzAxRXFmIf8k=";
+      };
+    };
+  }