1 files changed, 25 insertions, 37 deletions

diff --git a/flake.nix b/flake.nix
index 8def35e..2d2af22 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,44 +9,32 @@
       nixpkgs,
       flake-utils,
     }:
-    let
-      overlay =
-        final: prev:
-        let
-          sshPassword = "1234";
-          sshPort = 43922;
-          httpPort = 43980;
+    flake-utils.lib.eachSystem [ "x86_64-linux" "aarch64-linux" ] (
+      system:
+      let
+        pkgs = import nixpkgs {
+          inherit system;
+          overlays = nixpkgs.lib.optional (system == "aarch64-linux") (import ./overlay.nix);
+        };
 
-          server = final.callPackage ./server.nix {
-            inherit sshPassword sshPort httpPort;
-          };
-          client = final.callPackage ./client.nix {
-            inherit sshPassword sshPort httpPort;
-          };
+        sshPort = 43922;
+        httpPort = 43980;
 
-          reMder = final.symlinkJoin {
-            name = "reMder";
-            paths = [
-              client
-              server
-            ];
-          };
-        in
-        {
-          inherit reMder;
+        server = pkgs.callPackage ./server.nix {
+          inherit sshPort httpPort;
+        };
+        client = pkgs.callPackage ./client.nix {
+          inherit sshPort httpPort;
+        };
+      in
+      {
+        packages.default = pkgs.symlinkJoin {
+          name = "reMder";
+          paths = [
+            client
+            server
+          ];
         };
-    in
-    flake-utils.lib.eachDefaultSystem (system: {
-      packages.default =
-        let
-          pkgs = import nixpkgs {
-            inherit system;
-            overlays = [ (import ./overlay.nix) overlay ];
-          };
-        in
-        pkgs.reMder;
-    })
-    // {
-      overlays.default = overlay;
-    };
+      }
+    );
 }