From 3f06250f80aa08b37bc4e8697ccc698649dc665c Mon Sep 17 00:00:00 2001
From: Alexandre Hallaine <alexandre@hallaine.com>
Date: Sun, 19 Jul 2026 23:13:31 +0000
Subject: [PATCH] style(system): standardize section ordering and nix module formatting

---
 system/eu-server.nix | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------
 system/gl-desktop.nix | 4 ++--
 system/shared/desktop.nix | 30 +++++++++++++++---------------
 system/shared/server.nix | 10 +++++-----
 4 file(s) changed, 75 insertion(s)(+), 70 deletion(s)(-)

diff --git a/system/eu-server.nix b/system/eu-server.nix
--- a/system/eu-server.nix
+++ b/system/eu-server.nix
@@ -84,62 +84,67 @@
     };
   };
 
-  services.syncthing = {
-    enable = true;
-    openDefaultPorts = true;
-    settings.devices."na-server" = {
-      id = "LTGLJRC-CBANTCJ-MPFI2JC-VBLLSOT-OFGV5BE-3365BYO-D3VYNGW-H47YIQQ";
-      addresses = [ "tcp://na-server:22000" ];
-    };
-    settings.folders."data-sync" = {
-      path = "/data/syncthing";
-      devices = [ "na-server" ];
-    };
-  };
-
-  services.prometheus = {
-    enable = true;
-    scrapeConfigs = [
-      {
-        job_name = "node";
-        scrape_interval = "15s";
-        static_configs = [
-          {
-            targets = [
-              "eu-server:9100"
-              "na-server:9100"
-            ];
-          }
-        ];
-      }
-    ];
-  };
-
   sops.secrets.grafana.owner = "grafana";
-  systemd.services.grafana.serviceConfig.EnvironmentFile = config.sops.secrets.grafana.path;
 
-  services.grafana = {
-    enable = true;
-    settings = {
-      server.http_addr = "0.0.0.0";
-      security.secret_key = "$__env{grafana}";
-    };
-    provision = {
+  services = {
+    syncthing = {
       enable = true;
-      datasources.settings.datasources = [
+      openDefaultPorts = true;
+      settings.devices."na-server" = {
+        id = "LTGLJRC-CBANTCJ-MPFI2JC-VBLLSOT-OFGV5BE-3365BYO-D3VYNGW-H47YIQQ";
+        addresses = [ "tcp://na-server:22000" ];
+      };
+      settings.folders."data-sync" = {
+        path = "/data/syncthing";
+        devices = [ "na-server" ];
+      };
+    };
+
+    prometheus = {
+      enable = true;
+      scrapeConfigs = [
         {
-          name = "Prometheus";
-          type = "prometheus";
-          url = "http://localhost:9090";
-          jsonData.timeInterval = "15s";
+          job_name = "node";
+          scrape_interval = "15s";
+          static_configs = [
+            {
+              targets = [
+                "eu-server:9100"
+                "na-server:9100"
+              ];
+            }
+          ];
         }
       ];
     };
+
+    grafana = {
+      enable = true;
+      settings = {
+        server.http_addr = "0.0.0.0";
+        security.secret_key = "$__env{grafana}";
+      };
+      provision = {
+        enable = true;
+        datasources.settings.datasources = [
+          {
+            name = "Prometheus";
+            type = "prometheus";
+            url = "http://localhost:9090";
+            jsonData.timeInterval = "15s";
+          }
+        ];
+      };
+    };
+
+    n8n.enable = true;
   };
 
-  services.n8n.enable = true;
-  systemd.services.n8n = {
-    path = with pkgs; [ nodejs ];
-    environment.N8N_SECURE_COOKIE = "false";
+  systemd.services = {
+    grafana.serviceConfig.EnvironmentFile = config.sops.secrets.grafana.path;
+    n8n = {
+      path = with pkgs; [ nodejs ];
+      environment.N8N_SECURE_COOKIE = "false";
+    };
   };
 }
diff --git a/system/gl-desktop.nix b/system/gl-desktop.nix
--- a/system/gl-desktop.nix
+++ b/system/gl-desktop.nix
@@ -19,6 +19,8 @@
     };
   };
 
+  hardware.framework.laptop13.audioEnhancement.enable = true;
+
   fileSystems = {
     "/boot" = {
       device = "/dev/disk/by-uuid/1A06-49C6";
@@ -73,8 +75,6 @@
       ];
     };
   };
-
-  hardware.framework.laptop13.audioEnhancement.enable = true;
 
   services.thermald.enable = true;
 }
diff --git a/system/shared/desktop.nix b/system/shared/desktop.nix
--- a/system/shared/desktop.nix
+++ b/system/shared/desktop.nix
@@ -4,13 +4,17 @@
 
   boot.kernelPackages = pkgs.linuxPackages_zen;
 
-  security.rtkit.enable = true;
+  hardware = {
+    bluetooth.enable = true;
+    keyboard.qmk.enable = true;
 
-  users.users.alexandre.extraGroups = [
-    "libvirtd"
-    "scanner"
-    "lp"
-  ];
+    sane = {
+      enable = true;
+      extraBackends = with pkgs; [ sane-airscan ];
+    };
+  };
+
+  security.rtkit.enable = true;
 
   virtualisation = {
     libvirtd.enable = true;
@@ -56,13 +60,9 @@
     haruna
   ];
 
-  hardware = {
-    bluetooth.enable = true;
-    keyboard.qmk.enable = true;
-
-    sane = {
-      enable = true;
-      extraBackends = with pkgs; [ sane-airscan ];
-    };
-  };
+  users.users.alexandre.extraGroups = [
+    "libvirtd"
+    "scanner"
+    "lp"
+  ];
 }
diff --git a/system/shared/server.nix b/system/shared/server.nix
--- a/system/shared/server.nix
+++ b/system/shared/server.nix
@@ -4,6 +4,11 @@
 
   time.timeZone = "Etc/UTC";
 
+  sops = {
+    defaultSopsFile = ../../secrets.yaml;
+    age.keyFile = "/var/lib/sops-nix/key.txt";
+  };
+
   services = {
     prometheus.exporters.node = {
       enable = true;
@@ -17,10 +22,5 @@
       "--ssh"
       "--advertise-exit-node"
     ];
-  };
-
-  sops = {
-    defaultSopsFile = ../../secrets.yaml;
-    age.keyFile = "/var/lib/sops-nix/key.txt";
   };
 }

--
tangled.sh