From 6d0186eadbd59674af639b23da7d22ea099b5696 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@hoyer.xyz>
Date: Mon, 20 Apr 2026 10:09:24 +0200
Subject: [PATCH] chore: statix fix

---
 homes/aarch64-linux/harald@m4nix/default.nix    | 2 +-
 homes/aarch64-linux/harald@rnix/default.nix     | 2 +-
 homes/x86_64-linux/harald@amd/default.nix       | 2 +-
 homes/x86_64-linux/harald@halo/default.nix      | 2 +-
 homes/x86_64-linux/harald@mx/default.nix        | 2 +-
 homes/x86_64-linux/harald@nixtee1/default.nix   | 2 +-
 homes/x86_64-linux/harald@sgx-nixos/default.nix | 2 +-
 homes/x86_64-linux/harald@sgx/default.nix       | 2 +-
 homes/x86_64-linux/harald@t15/default.nix       | 2 +-
 homes/x86_64-linux/harald@x1/default.nix        | 2 +-
 lib/deploy/default.nix                          | 2 +-
 modules/common.nix                              | 4 +---
 modules/darwin/nix/default.nix                  | 2 +-
 modules/home/tools/git/default.nix              | 2 +-
 modules/nixos/nix/default.nix                   | 4 ++--
 modules/nixos/services/acme-base/default.nix    | 4 ++--
 modules/nixos/services/gui/default.nix          | 6 ++----
 modules/nixos/services/nginx-base/default.nix   | 2 +-
 modules/nixos/services/xremap/default.nix       | 2 +-
 modules/nixos/tools/git/default.nix             | 4 ++--
 modules/nixos/user/default.nix                  | 2 +-
 overlays/inetutils-darwin-fix/default.nix       | 2 +-
 overlays/mods/default.nix                       | 2 +-
 systems/nixbuild.nix                            | 2 +-
 systems/x86_64-linux/amd/sound.nix              | 2 +-
 systems/x86_64-linux/amd/xremap.nix             | 2 +-
 systems/x86_64-linux/halo/default.nix           | 3 +--
 systems/x86_64-linux/halo/sound.nix             | 2 +-
 systems/x86_64-linux/halo/xremap.nix            | 2 +-
 systems/x86_64-linux/mx/nginx.nix               | 2 +-
 systems/x86_64-linux/sgx/fileserver.nix         | 4 +---
 systems/x86_64-linux/sgx/openwebui.nix          | 2 +-
 systems/x86_64-linux/sgx/uptime-kuma.nix        | 2 +-
 systems/x86_64-linux/sgx/wyoming.nix            | 2 +-
 systems/x86_64-linux/x1/xremap.nix              | 2 +-
 35 files changed, 39 insertions(+), 46 deletions(-)

diff --git a/homes/aarch64-linux/harald@m4nix/default.nix b/homes/aarch64-linux/harald@m4nix/default.nix
index 50d909b..b741ccd 100644
--- a/homes/aarch64-linux/harald@m4nix/default.nix
+++ b/homes/aarch64-linux/harald@m4nix/default.nix
@@ -5,7 +5,7 @@
   metacfg = {
     user = {
       enable = true;
-      name = config.snowfallorg.user.name;
+      inherit (config.snowfallorg.user) name;
     };
     cli-apps = {
       bash.enable = true;
diff --git a/homes/aarch64-linux/harald@rnix/default.nix b/homes/aarch64-linux/harald@rnix/default.nix
index 50d909b..b741ccd 100644
--- a/homes/aarch64-linux/harald@rnix/default.nix
+++ b/homes/aarch64-linux/harald@rnix/default.nix
@@ -5,7 +5,7 @@
   metacfg = {
     user = {
       enable = true;
-      name = config.snowfallorg.user.name;
+      inherit (config.snowfallorg.user) name;
     };
     cli-apps = {
       bash.enable = true;
diff --git a/homes/x86_64-linux/harald@amd/default.nix b/homes/x86_64-linux/harald@amd/default.nix
index b007f30..9f5f8e1 100644
--- a/homes/x86_64-linux/harald@amd/default.nix
+++ b/homes/x86_64-linux/harald@amd/default.nix
@@ -8,7 +8,7 @@
   metacfg = {
     user = {
       enable = true;
-      name = config.snowfallorg.user.name;
+      inherit (config.snowfallorg.user) name;
     };
     cli-apps = {
       bash.enable = true;
diff --git a/homes/x86_64-linux/harald@halo/default.nix b/homes/x86_64-linux/harald@halo/default.nix
index b007f30..9f5f8e1 100644
--- a/homes/x86_64-linux/harald@halo/default.nix
+++ b/homes/x86_64-linux/harald@halo/default.nix
@@ -8,7 +8,7 @@
   metacfg = {
     user = {
       enable = true;
-      name = config.snowfallorg.user.name;
+      inherit (config.snowfallorg.user) name;
     };
     cli-apps = {
       bash.enable = true;
diff --git a/homes/x86_64-linux/harald@mx/default.nix b/homes/x86_64-linux/harald@mx/default.nix
index baf012e..8d2e8f2 100644
--- a/homes/x86_64-linux/harald@mx/default.nix
+++ b/homes/x86_64-linux/harald@mx/default.nix
@@ -14,7 +14,7 @@
   metacfg = {
     user = {
       enable = true;
-      name = config.snowfallorg.user.name;
+      inherit (config.snowfallorg.user) name;
     };
     cli-apps = {
       bash.enable = true;
diff --git a/homes/x86_64-linux/harald@nixtee1/default.nix b/homes/x86_64-linux/harald@nixtee1/default.nix
index b20722a..a6b757a 100644
--- a/homes/x86_64-linux/harald@nixtee1/default.nix
+++ b/homes/x86_64-linux/harald@nixtee1/default.nix
@@ -5,7 +5,7 @@
   metacfg = {
     user = {
       enable = true;
-      name = config.snowfallorg.user.name;
+      inherit (config.snowfallorg.user) name;
     };
     cli-apps = {
       bash.enable = true;
diff --git a/homes/x86_64-linux/harald@sgx-nixos/default.nix b/homes/x86_64-linux/harald@sgx-nixos/default.nix
index aea682c..6d68e9e 100644
--- a/homes/x86_64-linux/harald@sgx-nixos/default.nix
+++ b/homes/x86_64-linux/harald@sgx-nixos/default.nix
@@ -5,7 +5,7 @@
   metacfg = {
     user = {
       enable = true;
-      name = config.snowfallorg.user.name;
+      inherit (config.snowfallorg.user) name;
     };
     cli-apps = {
       bash.enable = true;
diff --git a/homes/x86_64-linux/harald@sgx/default.nix b/homes/x86_64-linux/harald@sgx/default.nix
index aea682c..6d68e9e 100644
--- a/homes/x86_64-linux/harald@sgx/default.nix
+++ b/homes/x86_64-linux/harald@sgx/default.nix
@@ -5,7 +5,7 @@
   metacfg = {
     user = {
       enable = true;
-      name = config.snowfallorg.user.name;
+      inherit (config.snowfallorg.user) name;
     };
     cli-apps = {
       bash.enable = true;
diff --git a/homes/x86_64-linux/harald@t15/default.nix b/homes/x86_64-linux/harald@t15/default.nix
index 50d909b..b741ccd 100644
--- a/homes/x86_64-linux/harald@t15/default.nix
+++ b/homes/x86_64-linux/harald@t15/default.nix
@@ -5,7 +5,7 @@
   metacfg = {
     user = {
       enable = true;
-      name = config.snowfallorg.user.name;
+      inherit (config.snowfallorg.user) name;
     };
     cli-apps = {
       bash.enable = true;
diff --git a/homes/x86_64-linux/harald@x1/default.nix b/homes/x86_64-linux/harald@x1/default.nix
index 600e092..9297223 100644
--- a/homes/x86_64-linux/harald@x1/default.nix
+++ b/homes/x86_64-linux/harald@x1/default.nix
@@ -8,7 +8,7 @@
   metacfg = {
     user = {
       enable = true;
-      name = config.snowfallorg.user.name;
+      inherit (config.snowfallorg.user) name;
     };
     cli-apps = {
       bash.enable = true;
diff --git a/lib/deploy/default.nix b/lib/deploy/default.nix
index ed5b01d..a01b441 100644
--- a/lib/deploy/default.nix
+++ b/lib/deploy/default.nix
@@ -29,7 +29,7 @@ rec {
         let
           host = hosts.${name};
           user = host.config.metacfg.user.name or null;
-          system = host.pkgs.stdenv.hostPlatform.system;
+          inherit (host.pkgs.stdenv.hostPlatform) system;
         in
         result
         // {
diff --git a/modules/common.nix b/modules/common.nix
index 18f8c8d..339ca3e 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -1,6 +1,4 @@
-{
-  ...
-}:
+_:
 {
   defaultSSHKeys = [
     "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIDsb/Tr69YN5MQLweWPuJaRGm+h2kOyxfD6sqKEDTIwoAAAABHNzaDo= harald@fedora.fritz.box"
diff --git a/modules/darwin/nix/default.nix b/modules/darwin/nix/default.nix
index c28363b..e0140fd 100644
--- a/modules/darwin/nix/default.nix
+++ b/modules/darwin/nix/default.nix
@@ -31,7 +31,7 @@ in
         ];
       in
       {
-        package = cfg.package;
+        inherit (cfg) package;
 
         settings = {
           experimental-features = "nix-command flakes";
diff --git a/modules/home/tools/git/default.nix b/modules/home/tools/git/default.nix
index 18f7197..df0d662 100644
--- a/modules/home/tools/git/default.nix
+++ b/modules/home/tools/git/default.nix
@@ -10,7 +10,7 @@ let
   inherit (lib.metacfg) mkOpt enabled;
 
   cfg = config.metacfg.tools.git;
-  user = config.metacfg.user;
+  inherit (config.metacfg) user;
 in
 {
   options.metacfg.tools.git = {
diff --git a/modules/nixos/nix/default.nix b/modules/nixos/nix/default.nix
index dbb8c07..fbbbccd 100644
--- a/modules/nixos/nix/default.nix
+++ b/modules/nixos/nix/default.nix
@@ -54,10 +54,10 @@ in
           config.metacfg.user.name
         ]
         ++ optional config.services.hydra.enable "hydra";
-        extra-substituters = cfg.extra-substituters;
+        inherit (cfg) extra-substituters;
       in
       {
-        package = cfg.package;
+        inherit (cfg) package;
 
         settings = {
           experimental-features = "nix-command flakes";
diff --git a/modules/nixos/services/acme-base/default.nix b/modules/nixos/services/acme-base/default.nix
index d572848..0c11a17 100644
--- a/modules/nixos/services/acme-base/default.nix
+++ b/modules/nixos/services/acme-base/default.nix
@@ -32,8 +32,8 @@ in
     security.acme = {
       acceptTerms = true;
       defaults = {
-        email = cfg.email;
-        dnsProvider = cfg.dnsProvider;
+        inherit (cfg) email;
+        inherit (cfg) dnsProvider;
         credentialsFile = mkIf (cfg.credentialsFile != null) cfg.credentialsFile;
       };
     };
diff --git a/modules/nixos/services/gui/default.nix b/modules/nixos/services/gui/default.nix
index 20fdf70..465e159 100644
--- a/modules/nixos/services/gui/default.nix
+++ b/modules/nixos/services/gui/default.nix
@@ -71,8 +71,7 @@ in
       enable = true;
 
       extraPackages =
-        [ ]
-        ++ lib.optionals pkgs.stdenv.targetPlatform.isx86_64 (
+        lib.optionals pkgs.stdenv.targetPlatform.isx86_64 (
           with pkgs;
           [
             vpl-gpu-rt
@@ -90,8 +89,7 @@ in
         rocmEnv = pkgs.symlinkJoin {
           name = "rocm-combined";
           paths =
-            [ ]
-            ++ lib.optionals pkgs.stdenv.targetPlatform.isx86_64 (
+            lib.optionals pkgs.stdenv.targetPlatform.isx86_64 (
               with pkgs.rocmPackages;
               [
                 rocblas
diff --git a/modules/nixos/services/nginx-base/default.nix b/modules/nixos/services/nginx-base/default.nix
index 6b2dd52..e8484cb 100644
--- a/modules/nixos/services/nginx-base/default.nix
+++ b/modules/nixos/services/nginx-base/default.nix
@@ -25,7 +25,7 @@ in
 
     services.nginx = {
       enable = true;
-      clientMaxBodySize = cfg.clientMaxBodySize;
+      inherit (cfg) clientMaxBodySize;
       recommendedGzipSettings = true;
       recommendedOptimisation = true;
       recommendedProxySettings = true;
diff --git a/modules/nixos/services/xremap/default.nix b/modules/nixos/services/xremap/default.nix
index 6f22f38..9727f46 100644
--- a/modules/nixos/services/xremap/default.nix
+++ b/modules/nixos/services/xremap/default.nix
@@ -31,7 +31,7 @@ in
 
   config = {
     services.xremap = {
-      enable = cfg.enable;
+      inherit (cfg) enable;
       userName = mkIf cfg.enable cfg.userName;
       serviceMode = mkIf cfg.enable "user";
       withGnome = mkIf cfg.enable cfg.withGnome;
diff --git a/modules/nixos/tools/git/default.nix b/modules/nixos/tools/git/default.nix
index 9a79098..cc3a921 100644
--- a/modules/nixos/tools/git/default.nix
+++ b/modules/nixos/tools/git/default.nix
@@ -9,8 +9,8 @@ with lib;
 with lib.metacfg;
 let
   cfg = config.metacfg.tools.git;
-  gpg = config.metacfg.security.gpg;
-  user = config.metacfg.user;
+  inherit (config.metacfg.security) gpg;
+  inherit (config.metacfg) user;
 in
 {
   options.metacfg.tools.git = with types; {
diff --git a/modules/nixos/user/default.nix b/modules/nixos/user/default.nix
index 5fc7f66..baa078b 100644
--- a/modules/nixos/user/default.nix
+++ b/modules/nixos/user/default.nix
@@ -29,7 +29,7 @@ let
     pkgs.runCommandNoCC "propagated-icon"
       {
         passthru = {
-          fileName = cfg.icon.fileName;
+          inherit (cfg.icon) fileName;
         };
       }
       ''
diff --git a/overlays/inetutils-darwin-fix/default.nix b/overlays/inetutils-darwin-fix/default.nix
index b86d0af..9fc5644 100644
--- a/overlays/inetutils-darwin-fix/default.nix
+++ b/overlays/inetutils-darwin-fix/default.nix
@@ -1,4 +1,4 @@
-{ ... }:
+_:
 final: prev: {
   inetutils = prev.inetutils.overrideAttrs (old: {
     # Fix gnulib variadic macro error on Darwin with newer Clang
diff --git a/overlays/mods/default.nix b/overlays/mods/default.nix
index ac7a1fb..dfce3e3 100644
--- a/overlays/mods/default.nix
+++ b/overlays/mods/default.nix
@@ -1,4 +1,4 @@
-{ ... }:
+_:
 final: prev: {
   gnome-console = prev.gnome-console.overrideAttrs (prevAttrs: {
     patches = (prevAttrs.patches or [ ]) ++ [
diff --git a/systems/nixbuild.nix b/systems/nixbuild.nix
index 0b898af..fdb2a8c 100644
--- a/systems/nixbuild.nix
+++ b/systems/nixbuild.nix
@@ -1,4 +1,4 @@
-{ ... }:
+_:
 {
   nix.distributedBuilds = true;
 
diff --git a/systems/x86_64-linux/amd/sound.nix b/systems/x86_64-linux/amd/sound.nix
index cbd1bc3..99fa565 100644
--- a/systems/x86_64-linux/amd/sound.nix
+++ b/systems/x86_64-linux/amd/sound.nix
@@ -1,4 +1,4 @@
-{ ... }:
+_:
 {
   services.pipewire.wireplumber.extraConfig."51-audio-priorities" = {
     "monitor.alsa.rules" = [
diff --git a/systems/x86_64-linux/amd/xremap.nix b/systems/x86_64-linux/amd/xremap.nix
index c28dd0a..a3090d4 100644
--- a/systems/x86_64-linux/amd/xremap.nix
+++ b/systems/x86_64-linux/amd/xremap.nix
@@ -1,4 +1,4 @@
-{ ... }:
+_:
 {
   metacfg.services.xremap = {
     enable = true;
diff --git a/systems/x86_64-linux/halo/default.nix b/systems/x86_64-linux/halo/default.nix
index 46c5db2..927c743 100644
--- a/systems/x86_64-linux/halo/default.nix
+++ b/systems/x86_64-linux/halo/default.nix
@@ -27,8 +27,7 @@ with lib.metacfg;
     enable = true;
 
     extraPackages =
-      [ ]
-      ++ lib.optionals pkgs.stdenv.targetPlatform.isx86_64 (
+      lib.optionals pkgs.stdenv.targetPlatform.isx86_64 (
         with pkgs;
         [
           rocmPackages.clr.icd
diff --git a/systems/x86_64-linux/halo/sound.nix b/systems/x86_64-linux/halo/sound.nix
index cbd1bc3..99fa565 100644
--- a/systems/x86_64-linux/halo/sound.nix
+++ b/systems/x86_64-linux/halo/sound.nix
@@ -1,4 +1,4 @@
-{ ... }:
+_:
 {
   services.pipewire.wireplumber.extraConfig."51-audio-priorities" = {
     "monitor.alsa.rules" = [
diff --git a/systems/x86_64-linux/halo/xremap.nix b/systems/x86_64-linux/halo/xremap.nix
index c28dd0a..a3090d4 100644
--- a/systems/x86_64-linux/halo/xremap.nix
+++ b/systems/x86_64-linux/halo/xremap.nix
@@ -1,4 +1,4 @@
-{ ... }:
+_:
 {
   metacfg.services.xremap = {
     enable = true;
diff --git a/systems/x86_64-linux/mx/nginx.nix b/systems/x86_64-linux/mx/nginx.nix
index 9058509..6e61be9 100644
--- a/systems/x86_64-linux/mx/nginx.nix
+++ b/systems/x86_64-linux/mx/nginx.nix
@@ -1,4 +1,4 @@
-{ ... }:
+_:
 {
   services.nginx.virtualHosts = {
     "00000" = {
diff --git a/systems/x86_64-linux/sgx/fileserver.nix b/systems/x86_64-linux/sgx/fileserver.nix
index 71c51db..2dc8a07 100644
--- a/systems/x86_64-linux/sgx/fileserver.nix
+++ b/systems/x86_64-linux/sgx/fileserver.nix
@@ -1,6 +1,4 @@
-{
-  ...
-}:
+_:
 {
   systemd.services.netatalk.requires = [
     "mnt-backup.mount"
diff --git a/systems/x86_64-linux/sgx/openwebui.nix b/systems/x86_64-linux/sgx/openwebui.nix
index 995f66c..c072c47 100644
--- a/systems/x86_64-linux/sgx/openwebui.nix
+++ b/systems/x86_64-linux/sgx/openwebui.nix
@@ -1,4 +1,4 @@
-{ ... }:
+_:
 {
   services.open-webui = {
     enable = true;
diff --git a/systems/x86_64-linux/sgx/uptime-kuma.nix b/systems/x86_64-linux/sgx/uptime-kuma.nix
index 64e3a00..0001220 100644
--- a/systems/x86_64-linux/sgx/uptime-kuma.nix
+++ b/systems/x86_64-linux/sgx/uptime-kuma.nix
@@ -1,4 +1,4 @@
-{ ... }:
+_:
 {
   services.uptime-kuma = {
     enable = true;
diff --git a/systems/x86_64-linux/sgx/wyoming.nix b/systems/x86_64-linux/sgx/wyoming.nix
index f8a4bff..b8b2227 100644
--- a/systems/x86_64-linux/sgx/wyoming.nix
+++ b/systems/x86_64-linux/sgx/wyoming.nix
@@ -1,4 +1,4 @@
-{ ... }:
+_:
 {
   services.wyoming = {
     faster-whisper.servers."main" = {
diff --git a/systems/x86_64-linux/x1/xremap.nix b/systems/x86_64-linux/x1/xremap.nix
index c28dd0a..a3090d4 100644
--- a/systems/x86_64-linux/x1/xremap.nix
+++ b/systems/x86_64-linux/x1/xremap.nix
@@ -1,4 +1,4 @@
-{ ... }:
+_:
 {
   metacfg.services.xremap = {
     enable = true;