fix
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
{
|
||||
inputs,
|
||||
lib,
|
||||
pkgs,
|
||||
nixosModules,
|
||||
...
|
||||
@@ -9,8 +10,9 @@ let
|
||||
hostName = "Hermes";
|
||||
installDisk = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_115386992";
|
||||
sshKeys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICxY7ceahvTqe4AWGKRJNs1z4AdWT/WafkOBDaNrkB2p" # macbook
|
||||
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnXDsThKjzPeinuYlNhE2lsXdt+H9Iu4mLEYa3POdFPfpNxYPDTSCwxb92ptnoVfBARNg6JFCv2ur953bb7ksVsgYm4L4VJ2mqJOGToDrzZDEzplXuNF9TlPCtnS4s+w/HkS4aMzdTZybNp5MoN3GaP8tLQJOqWziiPTnaIvalEDmtCsgMpJRDUCgJ0Lv8TIKZWZRXkMfLv0VcMCAAqO2+CurqqrVGcoHa+QUDP1iEjUrTb8WyKE9N3+ZlG0OHswnVKBxQt2oviQRnWgLldQJRevFbmbrNQG1QRZ5OsA0sw0WGXVSvudFrqT5E/uyoeqyaw03F4v9UDph69OvopeJgNHpQiXRSKNu9KmoqyGtN0ybcAyv/3zAF+g76XEu1JhfQZRMWWhI91uTnZYFrm/NG/ARhDOex30zFMWkU7dg2AYcmD+XcW/xrUr60BnaM4C0JvsF3e+mE4DQPZstGkxO6sd5sXsL8fnn2iA/b5Rx6oEXj51xlcYB++7dOFQFR7IE=" # Lysator
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICxY7ceahvTqe4AWGKRJNs1z4AdWT/WafkOBDaNrkB2p" # macbook
|
||||
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnXDsThKjzPeinuYlNhE2lsXdt+H9Iu4mLEYa3POdFPfpNxYPDTSCwxb92ptnoVfBARNg6JFCv2ur953bb7ksVsgYm4L4VJ2mqJOGToDrzZDEzplXuNF9TlPCtnS4s+w/HkS4aMzdTZybNp5MoN3GaP8tLQJOqWziiPTnaIvalEDmtCsgMpJRDUCgJ0Lv8TIKZWZRXkMfLv0VcMCAAqO2+CurqqrVGcoHa+QUDP1iEjUrTb8WyKE9N3+ZlG0OHswnVKBxQt2oviQRnWgLldQJRevFbmbrNQG1QRZ5OsA0sw0WGXVSvudFrqT5E/uyoeqyaw03F4v9UDph69OvopeJgNHpQiXRSKNu9KmoqyGtN0ybcAyv/3zAF+g76XEu1JhfQZRMWWhI91uTnZYFrm/NG/ARhDOex30zFMWkU7dg2AYcmD+XcW/xrUr60BnaM4C0JvsF3e+mE4DQPZstGkxO6sd5sXsL8fnn2iA/b5Rx6oEXj51xlcYB++7dOFQFR7IE=" # Lysator
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBcMIOlEqBbL7ZhoqaC6pCGNsHdJeJ5SY66sUB2+CVGo" # desktop
|
||||
];
|
||||
in
|
||||
{
|
||||
@@ -29,12 +31,21 @@ in
|
||||
nixosModules.base
|
||||
nixosModules.zfsRoot
|
||||
nixosModules.luksInitrdSshUnlock
|
||||
nixosModules.mailServer
|
||||
#nixosModules.mailServer
|
||||
nixosModules.binBashWrapper
|
||||
];
|
||||
|
||||
my.binBashWrapper.enable = true;
|
||||
|
||||
boot.loader.systemd-boot.enable = lib.mkForce false;
|
||||
boot.loader.efi.canTouchEfiVariables = lib.mkForce false;
|
||||
boot.loader.grub = {
|
||||
enable = lib.mkForce true;
|
||||
device = installDisk;
|
||||
efiSupport = true;
|
||||
efiInstallAsRemovable = true;
|
||||
};
|
||||
|
||||
my.initrdSshUnlock = {
|
||||
enable = true;
|
||||
authorizedKeys = sshKeys;
|
||||
|
||||
@@ -7,6 +7,11 @@
|
||||
content = {
|
||||
type = "gpt";
|
||||
partitions = {
|
||||
BIOS = {
|
||||
size = "1M";
|
||||
type = "EF02";
|
||||
};
|
||||
|
||||
ESP = {
|
||||
label = "EFI";
|
||||
size = "512M";
|
||||
|
||||
Reference in New Issue
Block a user