KropCloud/machines-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: KropCloud:141c841c29ce144be2c8842f18b30480ae516e37
Branches Tags
KropCloud:master
..
compare: KropCloud:284861635969ef795c15b701c481b2d909ad3355
Branches Tags
KropCloud:master

No commits in common. "141c841c29ce144be2c8842f18b30480ae516e37" and "284861635969ef795c15b701c481b2d909ad3355" have entirely different histories.
141c841c29 ... 2848616359

3 changed files with 5 additions and 25 deletions
Show stats Expand all files Collapse all files

5
hosts/base/default.nix
View file

@ -10,10 +10,7 @@
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nix.settings.experimental-features = [ nix.settings.experimental-features = [ "nix-command" "flakes" ];
"nix-command"
"flakes"
];
kropcloud = { kropcloud = {
admin = { admin = {

1
hosts/hydra/default.nix
View file

@ -5,7 +5,6 @@
ipv4 = { ipv4 = {
address = "192.168.1.160"; address = "192.168.1.160";
prefixLength = 24; prefixLength = 24;
defaultGateway = "192.168.1.1";
}; };
}; };
}; };

24
nixosModules/networking/default.nix
View file

@ -18,12 +18,6 @@ let
default = null; default = null;
example = if version == 4 then 24 else 64; example = if version == 4 then 24 else 64;
}; };
defaultGateway = lib.mkOption {
type = lib.types.nullOr lib.types.str;
description = "The defautl gateway IPv${version}";
default = null;
example = if version == 4 then "192.168.1.1" else null;
};
}; };
in in
{ {
@ -40,10 +34,9 @@ in
assertions = [ assertions = [
{ {
assertion = assertion = !(cfg.ipv4.address == null || cfg.ipv4.prefixLength == null);
!(cfg.ipv4.address == null || cfg.ipv4.prefixLength == null || cfg.ipv4.defaultGateway == null);
message = '' message = ''
You need to provide valid values for `address`, `prefixLength` and `defaultGateway` in `kropcloud.networking.ipv4` You need to provide valid values for both `address` and `prefixLength` in `kropcloud.networking.ipv4`
when either is set. when either is set.
''; '';
} }
@ -64,17 +57,8 @@ in
]; ];
}; };
}; };
useDHCP = ( useDHCP = (cfg.ipv4.address == null || cfg.ipv4.prefixLength == null);
cfg.ipv4.address == null || cfg.ipv4.prefixLength == null || cfg.ipv4.defaultGateway == null nameservers = [ "8.8.8.8" "1.1.1.1" ];
);
defaultGateway = lib.mkIf (cfg.ipv4.defaultGateway != null) { address = cfg.ipv4.defaultGateway; };
nameservers =
lib.mkIf
(cfg.ipv4.address != null || cfg.ipv4.prefixLength != null || cfg.ipv4.defaultGateway != null)
[
"8.8.8.8"
"1.1.1.1"
];
}; };
}; };
} }