From 1f1106c5b522c26858221ba99f70d2308a8164fe Mon Sep 17 00:00:00 2001
From: Franck Cuny <franck@fcuny.net>
Date: Tue, 2 May 2023 19:43:02 -0700
Subject: profiles/server: move boot loader configuration

---
 hosts/carmel/boot.nix    | 21 ++++++---------------
 hosts/tahoe/hardware.nix |  3 ---
 profiles/server.nix      |  3 +++
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/hosts/carmel/boot.nix b/hosts/carmel/boot.nix
index c867bfb..b3b63da 100644
--- a/hosts/carmel/boot.nix
+++ b/hosts/carmel/boot.nix
@@ -1,21 +1,12 @@
 { ... }:
 
 {
-  boot = {
-    loader = {
-      systemd-boot = {
-        enable = true;
-        # see https://www.man7.org/linux/man-pages/man5/loader.conf.5.html
-        consoleMode = "max";
-      };
-      efi.efiSysMountPoint = "/boot/efi";
-    };
+  boot.loader.efi.efiSysMountPoint = "/boot/efi";
 
-    kernel.sysctl = {
-      "net.ipv4.conf.all.forwarding" = true;
-      "net.ipv4.conf.default.forwarding" = true;
-      "net.core.default_qdisc" = "fq";
-      "net.ipv4.tcp_congestion_control" = "bbr";
-    };
+  boot.kernel.sysctl = {
+    "net.ipv4.conf.all.forwarding" = true;
+    "net.ipv4.conf.default.forwarding" = true;
+    "net.core.default_qdisc" = "fq";
+    "net.ipv4.tcp_congestion_control" = "bbr";
   };
 }
diff --git a/hosts/tahoe/hardware.nix b/hosts/tahoe/hardware.nix
index 83e434f..5f14ab6 100644
--- a/hosts/tahoe/hardware.nix
+++ b/hosts/tahoe/hardware.nix
@@ -53,9 +53,6 @@
   boot.initrd.luks.devices."raid-slow".device =
     "/dev/disk/by-id/md-name-nixos:slow";
 
-  # see https://www.man7.org/linux/man-pages/man5/loader.conf.5.html
-  boot.loader.systemd-boot.consoleMode = "max";
-
   swapDevices =
     [{ device = "/dev/disk/by-uuid/0f54b5ab-4fca-4c5a-a9eb-622553145163"; }];
 }
diff --git a/profiles/server.nix b/profiles/server.nix
index 731ebe8..c4efb86 100644
--- a/profiles/server.nix
+++ b/profiles/server.nix
@@ -7,6 +7,9 @@
 
   powerManagement.cpuFreqGovernor = "schedutil";
 
+  # see https://www.man7.org/linux/man-pages/man5/loader.conf.5.html
+  boot.loader.systemd-boot.consoleMode = "max";
+
   console = {
     earlySetup = true;
     font = "${pkgs.terminus_font}/share/consolefonts/ter-132n.psf.gz";
-- 
cgit 1.4.1