fix
This commit is contained in:
@@ -1,5 +1,6 @@
|
|||||||
{
|
{
|
||||||
inputs,
|
inputs,
|
||||||
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
nixosModules,
|
nixosModules,
|
||||||
...
|
...
|
||||||
@@ -11,6 +12,7 @@ let
|
|||||||
sshKeys = [
|
sshKeys = [
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICxY7ceahvTqe4AWGKRJNs1z4AdWT/WafkOBDaNrkB2p" # macbook
|
"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-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
|
in
|
||||||
{
|
{
|
||||||
@@ -29,12 +31,21 @@ in
|
|||||||
nixosModules.base
|
nixosModules.base
|
||||||
nixosModules.zfsRoot
|
nixosModules.zfsRoot
|
||||||
nixosModules.luksInitrdSshUnlock
|
nixosModules.luksInitrdSshUnlock
|
||||||
nixosModules.mailServer
|
#nixosModules.mailServer
|
||||||
nixosModules.binBashWrapper
|
nixosModules.binBashWrapper
|
||||||
];
|
];
|
||||||
|
|
||||||
my.binBashWrapper.enable = true;
|
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 = {
|
my.initrdSshUnlock = {
|
||||||
enable = true;
|
enable = true;
|
||||||
authorizedKeys = sshKeys;
|
authorizedKeys = sshKeys;
|
||||||
|
|||||||
@@ -7,6 +7,11 @@
|
|||||||
content = {
|
content = {
|
||||||
type = "gpt";
|
type = "gpt";
|
||||||
partitions = {
|
partitions = {
|
||||||
|
BIOS = {
|
||||||
|
size = "1M";
|
||||||
|
type = "EF02";
|
||||||
|
};
|
||||||
|
|
||||||
ESP = {
|
ESP = {
|
||||||
label = "EFI";
|
label = "EFI";
|
||||||
size = "512M";
|
size = "512M";
|
||||||
|
|||||||
Reference in New Issue
Block a user