motiejus
/
config
1
Fork 0
Code Packages Releases Activity

statix: fix bugs with inherit 

now I know better what it does.
This commit is contained in:
Motiejus Jakštys 2023-10-01 23:26:01 +03:00
parent 652ce88b76
commit 1dd4f04725
10 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flake.nix
View File

@ -61,7 +61,7 @@
(_self: super: { (_self: super: {
deploy-rs = { deploy-rs = {
inherit (import nixpkgs {inherit system;}) deploy-rs; inherit (import nixpkgs {inherit system;}) deploy-rs;
inherit (super.deploy-rs.lib); inherit (super.deploy-rs) lib;
}; };
}) })
]; ];

2
hosts/fra1-a/configuration.nix
View File

@ -56,7 +56,7 @@
deployerbot = { deployerbot = {
follower = { follower = {
inherit (myData.hosts."vno1-oh2.servers.jakst".publicKey); inherit (myData.hosts."vno1-oh2.servers.jakst") publicKey;
enable = true; enable = true;
sshAllowSubnets = [myData.subnets.tailscale.sshPattern]; sshAllowSubnets = [myData.subnets.tailscale.sshPattern];

2
hosts/fwminex/configuration.nix
View File

@ -84,7 +84,7 @@ in {
deployerbot = { deployerbot = {
follower = { follower = {
inherit (myData.hosts."vno1-oh2.servers.jakst".publicKey); inherit (myData.hosts."vno1-oh2.servers.jakst") publicKey;
enable = true; enable = true;
uidgid = myData.uidgid.updaterbot-deployee; uidgid = myData.uidgid.updaterbot-deployee;

3
hosts/vno1-oh2/configuration.nix
View File

@ -196,10 +196,11 @@
}; };
follower = { follower = {
inherit (myData.hosts."vno1-oh2.servers.jakst") publicKey;
enable = true; enable = true;
sshAllowSubnets = [myData.subnets.tailscale.sshPattern]; sshAllowSubnets = [myData.subnets.tailscale.sshPattern];
uidgid = myData.uidgid.updaterbot-deployee; uidgid = myData.uidgid.updaterbot-deployee;
inherit (myData.hosts."vno1-oh2.servers.jakst".publicKey);
}; };
}; };

3
hosts/vno3-rp3b/configuration.nix
View File

@ -94,10 +94,11 @@
deployerbot = { deployerbot = {
follower = { follower = {
inherit (myData.hosts."vno1-oh2.servers.jakst") publicKey;
enable = true; enable = true;
sshAllowSubnets = [myData.subnets.tailscale.sshPattern]; sshAllowSubnets = [myData.subnets.tailscale.sshPattern];
uidgid = myData.uidgid.updaterbot-deployee; uidgid = myData.uidgid.updaterbot-deployee;
inherit (myData.hosts."vno1-oh2.servers.jakst".publicKey);
}; };
}; };

5
modules/base/zfsborg/default.nix
View File

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

2
modules/services/friendlyport/default.nix
View File

@ -22,7 +22,7 @@
}; };
config = let config = let
inherit (config.mj.services.friendlyport.ports); inherit (config.mj.services.friendlyport) ports;
mkAdd = proto: subnets: ints: let mkAdd = proto: subnets: ints: let
subnetsS = builtins.concatStringsSep "," subnets; subnetsS = builtins.concatStringsSep "," subnets;

2
modules/services/jakstpub/default.nix
View File

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

5
modules/services/syncthing/default.nix
View File

@ -105,10 +105,7 @@ in {
]; ];
services.syncthing = { services.syncthing = {
inherit (cfg.enable); inherit (cfg) enable user group dataDir;
inherit (cfg.user);
inherit (cfg.group);
inherit (cfg.dataDir);
openDefaultPorts = true; openDefaultPorts = true;
guiAddress = let guiAddress = let

1
statix.toml Normal file
View File

@ -0,0 +1 @@
ignore = ['modules/base/boot']