From 29825b745dc2229d3a292ca36961ca38eb38b735 Mon Sep 17 00:00:00 2001
From: Christine Elisabeth Koppel <kuutruu@posteo.net>
Date: Fri, 6 Feb 2026 22:04:27 +0100
Subject: [PATCH] Another attempt.

---
 nix-system-configs/modules/system/forgejo.nix | 24 +++++++++----------
 nix-system-configs/modules/system/traefik.nix | 18 +++++++-------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/nix-system-configs/modules/system/forgejo.nix b/nix-system-configs/modules/system/forgejo.nix
index f6ed7a0..1f899ce 100644
--- a/nix-system-configs/modules/system/forgejo.nix
+++ b/nix-system-configs/modules/system/forgejo.nix
@@ -31,6 +31,18 @@ in {
     };
   };
 
+  imports = [
+    # ./secrets/secrets.nix  # Add this locally after running add-secrets.zsh
+    # Optionally import local secrets if present (won't fail if missing)
+    (lib.optional (builtins.pathExists ./secrets/secrets.nix) ./secrets/secrets.nix)
+    ./modules/desktop-manager/sway_greetd_homemanager.nix
+    ./modules/local/hostname_username.nix
+    ./modules/local/networking_local.nix
+    ./modules/toolsets/remote_building.nix
+    ./modules/bootloader/seabios.nix
+    ./modules/lix-default.nix
+  ];
+
   config = {
     local.hostname = "forgejoprg";
     local.username = "forgejoprg";
@@ -94,18 +106,6 @@ in {
     # Open ports in the firewall.
     networking.firewall.allowedTCPPorts = [3000];
 
-    imports = [
-      # ./secrets/secrets.nix  # Add this locally after running add-secrets.zsh
-      # Optionally import local secrets if present (won't fail if missing)
-      (lib.optional (builtins.pathExists ./secrets/secrets.nix) ./secrets/secrets.nix)
-      ./modules/desktop-manager/sway_greetd_homemanager.nix
-      ./modules/local/hostname_username.nix
-      ./modules/local/networking_local.nix
-      ./modules/toolsets/remote_building.nix
-      ./modules/bootloader/seabios.nix
-      ./modules/lix-default.nix
-    ];
-
     system.stateVersion = "25.11";
   };
 }
diff --git a/nix-system-configs/modules/system/traefik.nix b/nix-system-configs/modules/system/traefik.nix
index e13ba29..ea99a1d 100644
--- a/nix-system-configs/modules/system/traefik.nix
+++ b/nix-system-configs/modules/system/traefik.nix
@@ -27,6 +27,15 @@
     };
   };
 
+  imports = [
+    ./modules/desktop-manager/sway_greetd_homemanager.nix
+    ./modules/local/hostname_username.nix
+    ./modules/local/networking_local.nix
+    ./modules/bootloader/seabios.nix
+    ./modules/lix-default.nix
+    # Optionally: ./modules/toolsets/remote_building.nix
+  ];
+
   config = {
     local.hostname = "nixos-traefik";
     local.username = "traefikprg";
@@ -112,15 +121,6 @@
     networking.firewall.allowedTCPPorts = [80 443];
     networking.firewall.allowedUDPPorts = [80 443];
 
-    imports = [
-      ./modules/desktop-manager/sway_greetd_homemanager.nix
-      ./modules/local/hostname_username.nix
-      ./modules/local/networking_local.nix
-      ./modules/bootloader/seabios.nix
-      ./modules/lix-default.nix
-      # Optionally: ./modules/toolsets/remote_building.nix
-    ];
-
     system.stateVersion = "25.11";
   };
 }