chn/nixos
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixos.git synced 2026-01-12 04:19:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix network in initrd

Browse Source
This commit is contained in:
陈浩南
2023-08-01 13:05:10 +08:00
parent bbc9292dfc
commit 1aa4683545
3 changed files with 41 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
flake.nix
View File

@@ -289,8 +289,11 @@
"/dev/mapper/root" = { "/nix" = "/nix"; "/nix/rootfs/current" = "/"; };
};
};
decrypt.auto."/dev/disk/by-uuid/cc0c27bb-15b3-4932-98a9-583b426002be" =
{ mapper = "root"; ssd = true; };
decrypt =
{
auto."/dev/disk/by-uuid/cc0c27bb-15b3-4932-98a9-583b426002be" = { mapper = "root"; ssd = true; };
manual.enable = true;
};
rollingRootfs = { device = "/dev/mapper/root"; path = "/nix/rootfs"; };
};
packages =
@@ -307,6 +310,7 @@
boot =
{
grub.installDevice = "/dev/disk/by-path/pci-0000:05:00.0";
network.enable = true;
sshd.enable = true;
};
system.hostname = "vps6";

27
modules/boot/default.nix
View File

@@ -8,6 +8,7 @@ inputs:
windowsEntries = mkOption { type = types.attrsOf types.nonEmptyStr; default = {}; };
installDevice = mkOption { type = types.str; }; # "efi" using efi, or dev path like "/dev/sda" using bios
};
network.enable = mkOption { type = types.bool; default = false; };
sshd.enable = mkOption { type = types.bool; default = false; };
};
config =
@@ -54,24 +55,26 @@ inputs:
}
{ boot.loader.grub.device = boot.grub.installDevice; }
)
# network
(
mkIf inputs.config.nixos.boot.network.enable
{
boot =
{
initrd.network.enable = true;
kernelParams = [ "ip=dhcp" ];
};
}
)
# sshd
(
mkIf inputs.config.nixos.boot.sshd.enable
{
boot.initrd =
boot.initrd.network.ssh =
{
network =
{
enable = true;
ssh =
{
enable = true;
hostKeys = [ "/etc/ssh/initrd_ssh_host_ed25519_key" ];
};
};
luks.forceLuksSupportInInitrd = true;
enable = true;
hostKeys = [ "/etc/ssh/initrd_ssh_host_ed25519_key" ];
};
networking.useDHCP = true;
}
)
];

25
modules/fileSystems/default.nix
View File

@@ -9,12 +9,23 @@ inputs:
# device.subvol = mountPoint;
btrfs = mkOption { type = types.attrsOf (types.attrsOf types.nonEmptyStr); default = {}; };
};
decrypt.auto = mkOption { type = types.attrsOf (types.submodule { options =
decrypt =
{
mapper = mkOption { type = types.nonEmptyStr; };
ssd = mkOption { type = types.bool; default = false; };
before = mkOption { type = types.nullOr (types.listOf types.nonEmptyStr); default = null; };
}; }); default = {}; };
auto = mkOption
{
type = types.attrsOf (types.submodule
{
options =
{
mapper = mkOption { type = types.nonEmptyStr; };
ssd = mkOption { type = types.bool; default = false; };
before = mkOption { type = types.nullOr (types.listOf types.nonEmptyStr); default = null; };
};
});
default = {};
};
manual.enable = mkOption { type = types.bool; default = false; };
};
mdadm = mkOption { type = types.nullOr types.str; default = null; };
swap = mkOption { type = types.listOf types.nonEmptyStr; default = []; };
resume = mkOption
@@ -112,6 +123,10 @@ inputs:
};
}
)
# decrypt.manual
(
mkIf (fileSystems.decrypt.manual.enable) { boot.initrd.luks.forceLuksSupportInInitrd = true; }
)
# mdadm
(
mkIf (fileSystems.mdadm != null)