From 3d93439b28881adb7cbe537257cb81b1d1938c14 Mon Sep 17 00:00:00 2001
From: eikek <eike.kettner@posteo.de>
Date: Sun, 10 Mar 2024 20:49:56 +0100
Subject: [PATCH] Lower memory requirement for test-vm

---
 flake.lock      |  6 +++---
 flake.nix       | 26 +++++++++++++++-----------
 nix/test-vm.nix |  4 +++-
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/flake.lock b/flake.lock
index e2f18d87..8b912198 100644
--- a/flake.lock
+++ b/flake.lock
@@ -6,11 +6,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1710025500,
-        "narHash": "sha256-niJf4WZ4GHQ+RaP+Qj4+6P/2SWN1Z4co36/ETvIg0Qg=",
+        "lastModified": 1710099997,
+        "narHash": "sha256-WmBKTLdth6I/D+0//9enbIXohGsBjepbjIAm9pCYj0U=",
         "owner": "eikek",
         "repo": "devshell-tools",
-        "rev": "57d7d292571e291fe8213a1655529f739cfa174d",
+        "rev": "e82faf976d318b3829f6f7f6785db6f3c7b65267",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 909a8451..cb6bc2e0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,7 +15,7 @@
   }:
     flake-utils.lib.eachDefaultSystem (system: let
       pkgs = nixpkgs.legacyPackages.${system};
-      sbt17 = pkgs.sbt.override { jre = pkgs.jdk17; };
+      sbt17 = pkgs.sbt.override {jre = pkgs.jdk17;};
       ciPkgs = with pkgs; [
         sbt17
         jdk17
@@ -28,14 +28,16 @@
         redocly-cli
         tailwindcss
       ];
-      devshellPkgs = ciPkgs ++ (with pkgs; [
-        jq
-        scala-cli
-        netcat
-        wget
-        which
-        inotifyTools
-      ]);
+      devshellPkgs =
+        ciPkgs
+        ++ (with pkgs; [
+          jq
+          scala-cli
+          netcat
+          wget
+          which
+          inotifyTools
+        ]);
       docspellPkgs = pkgs.callPackage (import ./nix/pkg.nix) {};
       dockerAmd64 = pkgs.pkgsCross.gnu64.callPackage (import ./nix/docker.nix) {
         inherit (docspellPkgs) docspell-restserver docspell-joex;
@@ -161,6 +163,9 @@
           system = "x86_64-linux";
           modules = [
             {
+              networking.hostName = "dev-vm";
+              virtualisation.memorySize = 2048;
+
               services.dev-postgres = {
                 enable = true;
                 databases = ["docspell"];
@@ -170,8 +175,8 @@
               services.dev-solr = {
                 enable = true;
                 cores = ["docspell"];
+                heap = 512;
               };
-
               port-forward.ssh = 10022;
               port-forward.dev-postgres = 6534;
               port-forward.dev-smtp = 10025;
@@ -180,7 +185,6 @@
               port-forward.dev-minio-api = 9000;
               port-forward.dev-minio-console = 9001;
               port-forward.dev-solr = 8983;
-              networking.hostName = "dev-vm";
             }
           ];
         };
diff --git a/nix/test-vm.nix b/nix/test-vm.nix
index 91ae32f3..96ddf039 100644
--- a/nix/test-vm.nix
+++ b/nix/test-vm.nix
@@ -22,6 +22,7 @@ in {
   services.dev-solr = {
     enable = true;
     cores = ["docspell"];
+    heap = 512;
   };
 
   port-forward.dev-webmail = 8080;
@@ -39,7 +40,8 @@ in {
     firewall.allowedTCPPorts = [7880];
   };
 
-  virtualisation.memorySize = 6144;
+  virtualisation.memorySize = 2048;
+  virtualisation.cores = 2;
 
   virtualisation.forwardPorts = [
     {