statix: fix bugs with inherit

now I know better what it does.
2023-10-01 23:26:01 +03:00
parent 652ce88b76
commit 1dd4f04725
10 changed files with 13 additions and 14 deletions
--- a/modules/services/friendlyport/default.nix
+++ b/modules/services/friendlyport/default.nix
@@ -22,7 +22,7 @@
  };

  config = let
-    inherit (config.mj.services.friendlyport.ports);
+    inherit (config.mj.services.friendlyport) ports;

    mkAdd = proto: subnets: ints: let
      subnetsS = builtins.concatStringsSep "," subnets;
--- a/modules/services/jakstpub/default.nix
+++ b/modules/services/jakstpub/default.nix
@@ -69,7 +69,7 @@ in {

    services.samba-wsdd = {
      enable = true;
-      inherit (cfg.hostname);
+      inherit (cfg) hostname;
    };

    users.users.jakstpub = {
--- a/modules/services/syncthing/default.nix
+++ b/modules/services/syncthing/default.nix
@@ -105,10 +105,7 @@ in {
    ];

    services.syncthing = {
-      inherit (cfg.enable);
-      inherit (cfg.user);
-      inherit (cfg.group);
-      inherit (cfg.dataDir);
+      inherit (cfg) enable user group dataDir;

      openDefaultPorts = true;
      guiAddress = let