From f7f6eabb0f13991ee8b0b9f44b6ee690e06f42bb Mon Sep 17 00:00:00 2001
From: Jonas Juselius <jonas.juselius@oceanbox.io>
Date: Fri, 12 Sep 2025 13:47:37 +0200
Subject: [PATCH] fix: misc fixes and tweaks

---
 rossby/c0/default.nix       |  2 +-
 rossby/default.nix          | 14 +++++++-------
 rossby/fs-work/default.nix  |  2 +-
 hive.nix => rossby/hive.nix | 12 ++++++------
 rossby/login/default.nix    |  2 +-
 rossby/manage/default.nix   |  2 +-
 6 files changed, 17 insertions(+), 17 deletions(-)
 rename hive.nix => rossby/hive.nix (60%)

diff --git a/rossby/c0/default.nix b/rossby/c0/default.nix
index 757a23d..3b631d2 100644
--- a/rossby/c0/default.nix
+++ b/rossby/c0/default.nix
@@ -10,7 +10,7 @@ let
   nodes = import ./nodes.nix;
 
   compute = {
-    deployment.tags = [ "compute" "c0" ];
+    deployment.tags = [ "compute" "c0" "cluster" ];
 
     fileSystems = {
       "/users" = {
diff --git a/rossby/default.nix b/rossby/default.nix
index 0cf67cc..9448a30 100644
--- a/rossby/default.nix
+++ b/rossby/default.nix
@@ -147,16 +147,16 @@ let
         controlMachine = "rossby-manage";
         mailDomain = "oceanbox.io";
         nodeName = [
-          "c0-[1-16] Sockets=2 CoresPerSocket=64 ThreadsPerCore=1 RealMemory=256000 TmpDisk=500000 State=UNKNOWN"
-          "rossby-login Sockets=2 CoresPerSocket=64 ThreadsPerCore=1 RealMemory=256000 TmpDisk=500000 State=UNKNOWN"
-          "rossby-manage Sockets=2 CoresPerSocket=64 ThreadsPerCore=1 RealMemory=256000 TmpDisk=500000 State=UNKNOWN"
+          "c0-[1-20] Sockets=2 CoresPerSocket=64 ThreadsPerCore=2 RealMemory=350000 TmpDisk=400000 State=UNKNOWN"
+          "rossby-login Sockets=1 CoresPerSocket=64 ThreadsPerCore=2 RealMemory=60000 TmpDisk=400000 State=UNKNOWN"
+          "rossby-manage Sockets=1 CoresPerSocket=64 ThreadsPerCore=2 RealMemory=60000 TmpDisk=400000 State=UNKNOWN"
         ];
         partitionName = [
-          "batch Nodes=c0-[1-16] Default=YES MaxTime=INFINITE State=UP"
+          "batch Nodes=c0-[1-20] Default=YES MaxTime=INFINITE State=UP"
           "rossby Nodes=rossby-login MaxTime=1:00:00 State=UP"
-          "short Nodes=c0-[1-8] MaxTime=INFINITE State=UP"
-          "long Nodes=c0-[3-8] MaxTime=INFINITE State=UP"
-          "stats Nodes=c0-[7-8] MaxTime=INFINITE State=UP"
+          "short Nodes=c0-[1-10] MaxTime=INFINITE State=UP"
+          "long Nodes=c0-[11-12] MaxTime=INFINITE State=UP"
+          "stats Nodes=c0-[19-20] MaxTime=INFINITE State=UP"
         ];
     };
   };
diff --git a/rossby/fs-work/default.nix b/rossby/fs-work/default.nix
index 42ec4ca..5566de1 100644
--- a/rossby/fs-work/default.nix
+++ b/rossby/fs-work/default.nix
@@ -11,7 +11,7 @@ let
   address = "10.255.241.90";
 in {
   fs-work = { config, pkgs, ... }: with pkgs; {
-    deployment.tags = [ "fs" "fs-work" ];
+    deployment.tags = [ "fs" "fs-work" "cluster" ];
     deployment.targetHost = address;
     system.autoUpgrade.enable = lib.mkForce false;
 
diff --git a/hive.nix b/rossby/hive.nix
similarity index 60%
rename from hive.nix
rename to rossby/hive.nix
index b504449..165cf6a 100644
--- a/hive.nix
+++ b/rossby/hive.nix
@@ -8,15 +8,15 @@ let
 
   rossby-manage = {
       deployment = {
-          tags = [ "manage" "login" ];
+          tags = [ "manage" "login" "cluster" ];
           allowLocalDeployment = true;
           targetHost = null;
       };
-      imports = [ ./rossby/manage ];
+      imports = [ ./manage ];
   };
 
-  rossby-login = import ./rossby/login { inherit pkgs; };
-  c0 = import ./rossby/c0 { inherit pkgs; };
-  fs-work = import ./rossby/fs-work { inherit pkgs; };
+  login = import ./login { inherit pkgs; };
+  c0 = import ./c0 { inherit pkgs; };
+  fs-work = import ./fs-work { inherit pkgs; };
 in
-    { inherit rossby-manage; } // rossby-login // c0 // fs-work
+    { inherit rossby-manage; } // login // c0 // fs-work
diff --git a/rossby/login/default.nix b/rossby/login/default.nix
index eef6fa7..ab4e44c 100644
--- a/rossby/login/default.nix
+++ b/rossby/login/default.nix
@@ -6,7 +6,7 @@ let
 in
 {
   rossby-login = { config, pkgs, ... }: with pkgs; {
-    deployment.tags = [ "rossby-login" "login"  ];
+    deployment.tags = [ "login" "cluster" ];
     deployment.targetHost = address;
     system.autoUpgrade.enable = lib.mkForce false;
 
diff --git a/rossby/manage/default.nix b/rossby/manage/default.nix
index 7974329..b1b8253 100644
--- a/rossby/manage/default.nix
+++ b/rossby/manage/default.nix
@@ -5,7 +5,7 @@ let
       [
          rec {
            idx = 222;
-           name = "rossby-login";
+           name = "rossby";
            address = "172.16.239.${toString idx}";
            ipoib = "172.16.240.${toString idx}";
            pubkey = ../login/ssh_host_key.pub;