From 5ecbea51056469221eb80f40e83d52855070344c Mon Sep 17 00:00:00 2001
From: Daniel Lundin <dln@arity.se>
Date: Sat, 16 Nov 2024 15:39:00 +0100
Subject: [PATCH] chore: flatten module structure

---
 flake.nix                                | 2 +-
 modules/image/{disk => }/builder.nix     | 0
 modules/image/{disk => }/default.nix     | 0
 modules/image/{disk => }/ssh.nix         | 0
 modules/image/{disk => }/updater.nix     | 0
 modules/image/{disk => }/veritysetup.nix | 0
 modules/profiles/network.nix             | 2 +-
 7 files changed, 2 insertions(+), 2 deletions(-)
 rename modules/image/{disk => }/builder.nix (100%)
 rename modules/image/{disk => }/default.nix (100%)
 rename modules/image/{disk => }/ssh.nix (100%)
 rename modules/image/{disk => }/updater.nix (100%)
 rename modules/image/{disk => }/veritysetup.nix (100%)

diff --git a/flake.nix b/flake.nix
index 3b659db..d45c794 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,7 +21,7 @@
       nixosModules.image.imports = [
         ./modules
         ./modules/profiles/base.nix
-        ./modules/image/disk
+        ./modules/image
       ];
 
       packages.${system} = {
diff --git a/modules/image/disk/builder.nix b/modules/image/builder.nix
similarity index 100%
rename from modules/image/disk/builder.nix
rename to modules/image/builder.nix
diff --git a/modules/image/disk/default.nix b/modules/image/default.nix
similarity index 100%
rename from modules/image/disk/default.nix
rename to modules/image/default.nix
diff --git a/modules/image/disk/ssh.nix b/modules/image/ssh.nix
similarity index 100%
rename from modules/image/disk/ssh.nix
rename to modules/image/ssh.nix
diff --git a/modules/image/disk/updater.nix b/modules/image/updater.nix
similarity index 100%
rename from modules/image/disk/updater.nix
rename to modules/image/updater.nix
diff --git a/modules/image/disk/veritysetup.nix b/modules/image/veritysetup.nix
similarity index 100%
rename from modules/image/disk/veritysetup.nix
rename to modules/image/veritysetup.nix
diff --git a/modules/profiles/network.nix b/modules/profiles/network.nix
index e042216..ccc21cb 100644
--- a/modules/profiles/network.nix
+++ b/modules/profiles/network.nix
@@ -22,7 +22,7 @@
 
   # Kernel
   boot.kernel.sysctl = {
-    "net.core.default_qdisc" = "fq";
+    "net.core.default_qdisc" = "fq";                # FIXME: manage these with networkd?
     "net.ipv4.tcp_congestion_control" = "bbr";
   };