From 18a2bef4fcba3ba165d3b900b4c577961f8e0507 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 6 Jan 2023 19:06:14 +0100
Subject: [PATCH] Reorder

---
 config/default.nix | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/config/default.nix b/config/default.nix
index 9c1c32fb..7ac22c98 100644
--- a/config/default.nix
+++ b/config/default.nix
@@ -7,6 +7,9 @@ lib.mkMerge [
   {
     boot = {
       cleanTmpDir = true;
+      kernel.sysctl = {
+        "net.ipv4.tcp_congestion_control" = "bbr";
+      };
       # recommend to turn off, only on by default for backwards compatibility
       zfs.forceImportRoot = false;
     };
@@ -77,20 +80,6 @@ lib.mkMerge [
     # trust sandro to set good defaults in nixos-modules
     opinionatedDefaults = true;
 
-    services = {
-      gnome.gnome-initial-setup.enable = false;
-      openssh = {
-        # Required for deployment and sops
-        enable = true;
-        permitRootLogin = "prohibit-password";
-      };
-      portunus = with zentralwerk.lib.config.site.net.serv; {
-        domain = "auth.c3d2.de";
-        externalIp4 = hosts4.auth;
-        externalIp6 = hosts6.up4.auth;
-      };
-    };
-
     programs = {
       fzf.keybindings = true;
       tmux = {
@@ -120,8 +109,18 @@ lib.mkMerge [
       vim.defaultEditor = true;
     };
 
-    boot.kernel.sysctl = {
-      "net.ipv4.tcp_congestion_control" = "bbr";
+    services = {
+      gnome.gnome-initial-setup.enable = false;
+      openssh = {
+        # Required for deployment and sops
+        enable = true;
+        permitRootLogin = "prohibit-password";
+      };
+      portunus = with zentralwerk.lib.config.site.net.serv; {
+        domain = "auth.c3d2.de";
+        externalIp4 = hosts4.auth;
+        externalIp6 = hosts6.up4.auth;
+      };
     };
 
     security.acme = {