Compare commits

..

No commits in common. "65252878249f00c3f361d13f9bd7824c235ecf08" and "e5980dca43c06abe12f7cb855b6db3e009c159e8" have entirely different histories.

2 changed files with 19 additions and 16 deletions

View file

@ -18,27 +18,30 @@
system.stateVersion = "24.05";
# FDE stuff
boot.kernelParams = [ "ip=dhcp" ];
boot.loader.timeout = 2;
networking.useDHCP = true;
boot.initrd = {
availableKernelModules = [ "r8169" ];
systemd.users.root.shell = "/bin/systemd-tty-ask-password-agent";
availableKernelModules = [ "virtio-pci" ];
secrets = {"/root/initrd-ssh-key" = "/root/initrd-ssh-key";};
network = {
udhcpc.enable = true;
flushBeforeStage2 = true;
enable = true;
ssh = {
enable = true;
port = 2222;
hostKeys = [ /root/initrd-ssh-key ];
hostKeys = [ /boot/initrd/ssh_host_rsa_key ];
# this includes the ssh keys of all users in the wheel group, but you can just specify some keys manually
# authorizedKeys = [ "ssh-rsa ..." ];
authorizedKeys = with lib; concatLists (mapAttrsToList (name: user: if elem "wheel" user.extraGroups then user.openssh.authorizedKeys.keys else []) config.users.users);
};
#postCommands = ''
# echo 'cryptsetup-askpass' >> /root/.profile
#'';
postCommands = ''
echo 'cryptsetup-askpass' >> /root/.profile
'';
};
};
}
}
}

View file

@ -14,10 +14,10 @@
boot.extraModulePackages = [ ];
boot.initrd.systemd.enable = true;
boot.initrd.luks.devices."root".device = "/dev/disk/by-uuid/db8a5cf9-c54b-4e6a-b3f9-e6323eb962a6";
#boot.initrd.luks.devices."root".device = "/dev/disk/by-uuid/db8a5cf9-c54b-4e6a-b3f9-e6323eb962a6";
fileSystems."/" =
{ device = "/dev/mapper/vg-root";
{ device = "/dev/disk/by-uuid/4f7afb2d-a730-4a0c-a9e4-92d75ebd1540";
fsType = "btrfs";
};
@ -28,7 +28,7 @@
};
swapDevices =
[ { device = "/dev/mapper/vg-swap"; }
[ { device = "/dev/disk/by-uuid/539bfdd3-6f33-4206-aa4d-7d06f3f91568"; }
];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
@ -40,4 +40,4 @@
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}
}