Compare commits
2 commits
e5980dca43
...
6525287824
Author | SHA1 | Date | |
---|---|---|---|
|
6525287824 | ||
|
c173ba1404 |
2 changed files with 16 additions and 19 deletions
|
@ -19,29 +19,26 @@
|
||||||
|
|
||||||
# FDE stuff
|
# FDE stuff
|
||||||
|
|
||||||
|
boot.kernelParams = [ "ip=dhcp" ];
|
||||||
|
boot.loader.timeout = 2;
|
||||||
|
networking.useDHCP = true;
|
||||||
boot.initrd = {
|
boot.initrd = {
|
||||||
availableKernelModules = [ "virtio-pci" ];
|
availableKernelModules = [ "r8169" ];
|
||||||
|
systemd.users.root.shell = "/bin/systemd-tty-ask-password-agent";
|
||||||
secrets = {"/root/initrd-ssh-key" = "/root/initrd-ssh-key";};
|
secrets = {"/root/initrd-ssh-key" = "/root/initrd-ssh-key";};
|
||||||
network = {
|
network = {
|
||||||
|
|
||||||
udhcpc.enable = true;
|
|
||||||
flushBeforeStage2 = true;
|
|
||||||
|
|
||||||
|
|
||||||
enable = true;
|
enable = true;
|
||||||
ssh = {
|
ssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
port = 2222;
|
port = 2222;
|
||||||
hostKeys = [ /boot/initrd/ssh_host_rsa_key ];
|
hostKeys = [ /root/initrd-ssh-key ];
|
||||||
# this includes the ssh keys of all users in the wheel group, but you can just specify some keys manually
|
# this includes the ssh keys of all users in the wheel group, but you can just specify some keys manually
|
||||||
# authorizedKeys = [ "ssh-rsa ..." ];
|
# authorizedKeys = [ "ssh-rsa ..." ];
|
||||||
authorizedKeys = with lib; concatLists (mapAttrsToList (name: user: if elem "wheel" user.extraGroups then user.openssh.authorizedKeys.keys else []) config.users.users);
|
authorizedKeys = with lib; concatLists (mapAttrsToList (name: user: if elem "wheel" user.extraGroups then user.openssh.authorizedKeys.keys else []) config.users.users);
|
||||||
};
|
};
|
||||||
postCommands = ''
|
#postCommands = ''
|
||||||
echo 'cryptsetup-askpass' >> /root/.profile
|
# echo 'cryptsetup-askpass' >> /root/.profile
|
||||||
'';
|
#'';
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
|
|
@ -14,10 +14,10 @@
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
boot.initrd.systemd.enable = true;
|
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."/" =
|
fileSystems."/" =
|
||||||
{ device = "/dev/disk/by-uuid/4f7afb2d-a730-4a0c-a9e4-92d75ebd1540";
|
{ device = "/dev/mapper/vg-root";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -28,7 +28,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
swapDevices =
|
swapDevices =
|
||||||
[ { device = "/dev/disk/by-uuid/539bfdd3-6f33-4206-aa4d-7d06f3f91568"; }
|
[ { device = "/dev/mapper/vg-swap"; }
|
||||||
];
|
];
|
||||||
|
|
||||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||||
|
|
Loading…
Reference in a new issue