refactor: servers & microvms

Author: ryan4yin

hosts/12kingdoms-suzu/microvm/mitsuha/default.nix

@@ -1,11 +1,11 @@
 {mylib, ...}: {
   imports =
     (mylib.scanPaths ./.)
-    ++ [
-      ../../../../nixos/base/ssh.nix
-      ../../../../nixos/base/user-group.nix
-      ../../../../nixos/base.nix
-    ];
+    ++ (map mylib.relativeToRoot [
+      "nixos/base/ssh.nix"
+      "nixos/base/user-group.nix"
+      "nixos/base.nix"
+    ]);
 
   microvm = {
     mem = 1024; # RAM allocation in MB

hosts/12kingdoms-suzu/microvm/suzi/default.nix

@@ -1,11 +1,18 @@
-{pkgs, mylib, mynixcfg-v055, ...}: {
+{
+  pkgs,
+  mylib,
+  mynixcfg-v055,
+  ...
+}: {
   imports =
     (mylib.scanPaths ./.)
+    ++ (map mylib.relativeToRoot [
+      "nixos/base/ssh.nix"
+      "nixos/base/user-group.nix"
+      "nixos/base.nix"
+    ])
     ++ [
       "${mynixcfg-v055}/secrets/nixos.nix"
-      ../../../../nixos/base/ssh.nix
-      ../../../../nixos/base/user-group.nix
-      ../../../../nixos/base.nix
     ];
 
   modules.secrets.server.network.enable = true;

nixos/base.nix

@@ -23,6 +23,7 @@
   environment.systemPackages = with pkgs; [
     git # used by nix flakes
     git-lfs # used by huggingface models
+    neovim
 
     # archives
     zip

nixos/server/server-aarch64.nix

@@ -16,7 +16,7 @@
     ../base.nix
   ];
 
-  boot.loader.timeout = lib.mkForce 3; # wait for 3 seconds to select the boot entry
+  boot.loader.timeout = lib.mkForce 7; # wait for x seconds to select the boot entry
   # Fix: jasper is marked as broken, refusing to evaluate.
   environment.enableAllTerminfo = lib.mkForce false;
 }

nixos/server/server-riscv64.nix

@@ -15,5 +15,5 @@
     ../base.nix
   ];
 
-  boot.loader.timeout = lib.mkForce 3; # wait for 3 seconds to select the boot entry
+  boot.loader.timeout = lib.mkForce 7; # wait for x seconds to select the boot entry
 }