statix: fix bugs with inherit

now I know better what it does.
This commit is contained in:
2023-10-01 23:26:01 +03:00
parent 652ce88b76
commit 1dd4f04725
10 changed files with 13 additions and 14 deletions

View File

@@ -67,8 +67,7 @@ in {
lib.nameValuePair
"${lib.strings.sanitizeDerivationName mountpoint}-${toString i}"
({
inherit (attrs.repo);
inherit (attrs.paths);
inherit (attrs) repo paths;
doInit = true;
encryption = {
@@ -95,7 +94,7 @@ in {
BORG_RSH = ''ssh -i "${config.mj.base.zfsborg.sshKeyPath}"'';
};
}
// lib.optionalAttrs (attrs ? patterns) {inherit (attrs.patterns);})
// lib.optionalAttrs (attrs ? patterns) {inherit (attrs) patterns;})
)
dirs
);

View File

@@ -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;

View File

@@ -69,7 +69,7 @@ in {
services.samba-wsdd = {
enable = true;
inherit (cfg.hostname);
inherit (cfg) hostname;
};
users.users.jakstpub = {

View File

@@ -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