fablab-nea/nix-gscheits
1
0
Fork 0
Code Issues 7 Pull requests 3 Projects Releases Packages Wiki Activity Actions

raven: reinstall for production

Browse source
This commit is contained in:
Simon Bruder 2021-12-08 17:42:01 +01:00 • committed by jalr
parent 8dbb95fa69
commit 7b0d60428d
5 changed files with 40 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
machines/default.nix
View file

@ -4,7 +4,7 @@ let
in
{
raven = {
targetHost = "10.105.255.242"; # FIXME
targetHost = "192.168.94.1";
system = "x86_64-linux";
extraModules = [
hardware.common-cpu-intel

19
machines/raven/configuration.nix
View file

@ -13,31 +13,22 @@
networking = {
useDHCP = false;
vlans = {
jt = {
id = 2;
interface = "enp0s25";
};
labprod = {
id = 1;
interface = "enp0s25";
};
labdev = {
id = 5;
interface = "enp0s25";
interface = "eno1";
};
};
interfaces = {
labprod.useDHCP = true;
jt.useDHCP = true;
labdev.ipv4.addresses = [{
eno2.useDHCP = true;
labprod.ipv4.addresses = [{
address = "192.168.94.1";
prefixLength = 24;
}];
};
nat = {
enable = true;
externalInterface = "jt";
internalInterfaces = lib.singleton "labdev";
externalInterface = "eno2";
internalInterfaces = lib.singleton "labprod";
};
};

12
machines/raven/hardware-configuration.nix
View file

@ -19,8 +19,14 @@
"aesni_intel"
"cryptd"
];
kernelModules = [ "dm-snapshot" ];
luks.devices."cryptroot".device = "/dev/disk/by-uuid/ad04bc72-bc84-42e3-856f-152c162ad88c";
luks.devices.root = {
name = "root";
device = "/dev/disk/by-uuid/ee78659c-52a5-4e81-8028-b43de08b6a55";
preLVM = true;
allowDiscards = true;
};
};
loader = {
@ -32,12 +38,12 @@
fileSystems = {
"/" = {
device = "/dev/disk/by-uuid/1ac13504-fb49-4739-a0e3-f87a3f840fb1";
device = "/dev/disk/by-uuid/80209d1b-27c6-423d-93e8-cd39e1893873";
fsType = "btrfs";
options = [ "discard=async" "noatime" "compress=zstd" ];
};
"/boot" = {
device = "/dev/disk/by-uuid/0FEA-FAF6";
device = "/dev/disk/by-uuid/20A0-5FD8";
fsType = "vfat";
};
};