From 6c8f40ff8f7aa425216ee91d9c3c642c5ce9ae84 Mon Sep 17 00:00:00 2001
From: Ranomier <>
Date: Tue, 17 Jun 2025 01:21:21 +0200
Subject: [PATCH] feat: move more stuff into system_profiles

---
 hosts/ext-julia/hardware-configuration.nix                 | 4 ----
 hosts/game-luanti/hardware-configuration.nix               | 3 ---
 modules/default.nix                                        | 1 -
 system_profiles/components/qemu.nix                        | 6 ++++++
 {modules => system_profiles/components}/serial-console.nix | 0
 system_profiles/server.nix                                 | 1 +
 6 files changed, 7 insertions(+), 8 deletions(-)
 create mode 100644 system_profiles/components/qemu.nix
 rename {modules => system_profiles/components}/serial-console.nix (100%)

diff --git a/hosts/ext-julia/hardware-configuration.nix b/hosts/ext-julia/hardware-configuration.nix
index 1e4a7ab..e26ed92 100644
--- a/hosts/ext-julia/hardware-configuration.nix
+++ b/hosts/ext-julia/hardware-configuration.nix
@@ -6,10 +6,6 @@
   modulesPath,
   ...
 }: {
-  imports = [
-    (modulesPath + "/profiles/qemu-guest.nix")
-  ];
-
   boot = {
     initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk"];
     initrd.kernelModules = [];
diff --git a/hosts/game-luanti/hardware-configuration.nix b/hosts/game-luanti/hardware-configuration.nix
index 6bbf7a7..e26ed92 100644
--- a/hosts/game-luanti/hardware-configuration.nix
+++ b/hosts/game-luanti/hardware-configuration.nix
@@ -6,9 +6,6 @@
   modulesPath,
   ...
 }: {
-  imports = [
-    (modulesPath + "/profiles/qemu-guest.nix")
-  ];
   boot = {
     initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk"];
     initrd.kernelModules = [];
diff --git a/modules/default.nix b/modules/default.nix
index e1045b5..a2abd41 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -11,7 +11,6 @@
     ./locale.nix
     ./networking.nix
     #./plymouth.nix # increases boot time too much
-    #./serial-console.nix # probably only for servers
     ./theming.nix
   ];
 }
diff --git a/system_profiles/components/qemu.nix b/system_profiles/components/qemu.nix
new file mode 100644
index 0000000..39b817d
--- /dev/null
+++ b/system_profiles/components/qemu.nix
@@ -0,0 +1,6 @@
+{modulesPath, ...}; {
+  imports = [
+    (modulesPath + "/profiles/qemu-guest.nix")
+  ];
+  services.qemuGuest.enable = true;
+}
diff --git a/modules/serial-console.nix b/system_profiles/components/serial-console.nix
similarity index 100%
rename from modules/serial-console.nix
rename to system_profiles/components/serial-console.nix
diff --git a/system_profiles/server.nix b/system_profiles/server.nix
index 8810958..56b00fe 100644
--- a/system_profiles/server.nix
+++ b/system_profiles/server.nix
@@ -2,6 +2,7 @@
   imports = [
     ./components/minify.nix
     ./components/nix-defaults.nix
+    ./components/qemu.nix
 
     ./importers/general.nix
     ./importers/server.nix