simono41/chaos-jetzt-nixfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove deprevated grub version definition

Browse source 
Also merged the various network configurations a bit for better clarity
This commit is contained in:
Moritz 'e1mo' Fromm 2023-07-28 11:45:39 +02:00
parent 8696e2cbef
commit 5722941e1d
No known key found for this signature in database
GPG key ID: 1D5D79A439E787F1
4 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
hosts/goldberg/configuration.nix
View file

@ -12,16 +12,20 @@
system.stateVersion = "23.05"; system.stateVersion = "23.05";
networking.hostName = "goldberg"; networking.hostName = "goldberg";
# Fallback / for the monitoring v(x)lan
networking.useDHCP = true;
# We need to configure IPv6 statically, and if we start with that we can just also do it for IPv4 networking = {
networking.interfaces.ens3.useDHCP = false; # Fallback / for the monitoring v(x)lan
networking.interfaces.ens3.ipv4.addresses = [ { address = "5.75.181.252"; prefixLength = 32; } ]; useDHCP = true;
networking.interfaces.ens3.ipv6.addresses = [ { address = "2a01:4f8:1c1e:9e75::1"; prefixLength = 64; } ]; defaultGateway = { address = "172.31.1.1"; interface = "ens3"; };
networking.defaultGateway = { address = "172.31.1.1"; interface = "ens3"; }; defaultGateway6 = { address = "fe80::1"; interface = "ens3"; };
networking.defaultGateway6 = { address = "fe80::1"; interface = "ens3"; }; nameservers = [ "213.133.98.98" "213.133.99.99" "213.133.100.100" ];
networking.nameservers = [ "213.133.98.98" "213.133.99.99" "213.133.100.100" ];
interfaces.ens3 = {
useDHCP = false;
ipv4.addresses = [ { address = "5.75.181.252"; prefixLength = 32; } ];
ipv6.addresses = [ { address = "2a01:4f8:1c1e:9e75::1"; prefixLength = 64; } ];
};
};
services.murmur = { services.murmur = {
registerPassword = lib.mkForce ""; registerPassword = lib.mkForce "";

1
hosts/goldberg/hardware-config.nix
View file

@ -22,7 +22,6 @@
# Use the GRUB 2 boot loader. # Use the GRUB 2 boot loader.
boot.loader.grub.enable = true; boot.loader.grub.enable = true;
boot.loader.grub.version = 2;
# boot.loader.grub.efiSupport = true; # boot.loader.grub.efiSupport = true;
# boot.loader.grub.efiInstallAsRemovable = true; # boot.loader.grub.efiInstallAsRemovable = true;
# boot.loader.efi.efiSysMountPoint = "/boot/efi"; # boot.loader.efi.efiSysMountPoint = "/boot/efi";

22
hosts/shirley/configuration.nix
View file

@ -12,14 +12,18 @@
system.stateVersion = "23.05"; system.stateVersion = "23.05";
networking.hostName = "shirley"; networking.hostName = "shirley";
# Fallback / for the monitoring v(x)lan
networking.useDHCP = true;
# We need to configure IPv6 statically, and if we start with that we can just also do it for IPv4 networking = {
networking.interfaces.ens3.useDHCP = false; # Fallback / for the monitoring v(x)lan
networking.interfaces.ens3.ipv4.addresses = [ { address = "94.130.107.245"; prefixLength = 32; } ]; useDHCP = true;
networking.interfaces.ens3.ipv6.addresses = [ { address = "2a01:4f8:c0c:83eb::1"; prefixLength = 64; } ]; defaultGateway = { address = "172.31.1.1"; interface = "ens3"; };
networking.defaultGateway = { address = "172.31.1.1"; interface = "ens3"; }; defaultGateway6 = { address = "fe80::1"; interface = "ens3"; };
networking.defaultGateway6 = { address = "fe80::1"; interface = "ens3"; }; nameservers = [ "213.133.98.98" "213.133.99.99" "213.133.100.100" ];
networking.nameservers = [ "213.133.98.98" "213.133.99.99" "213.133.100.100" ];
interfaces.ens3 = {
useDHCP = false;
ipv4.addresses = [ { address = "94.130.107.245"; prefixLength = 32; } ];
ipv6.addresses = [ { address = "2a01:4f8:c0c:83eb::1"; prefixLength = 64; } ];
};
};
} }

1
hosts/shirley/hardware-config.nix
View file

@ -22,7 +22,6 @@
# Use the GRUB 2 boot loader. # Use the GRUB 2 boot loader.
boot.loader.grub.enable = true; boot.loader.grub.enable = true;
boot.loader.grub.version = 2;
# boot.loader.grub.efiSupport = true; # boot.loader.grub.efiSupport = true;
# boot.loader.grub.efiInstallAsRemovable = true; # boot.loader.grub.efiInstallAsRemovable = true;
# boot.loader.efi.efiSysMountPoint = "/boot/efi"; # boot.loader.efi.efiSysMountPoint = "/boot/efi";