это победа, nixos на hostvds

This commit is contained in:
2025-07-23 19:29:07 +03:00
parent 03c452b9ce
commit 1415210244
3 changed files with 16 additions and 11 deletions
+13 -8
View File
@@ -7,21 +7,20 @@
content = { content = {
type = "gpt"; type = "gpt";
partitions = { partitions = {
ESP = { boot = {
type = "EF02"; type = "EF02";
size = "512M"; size = "1M";
};
ESP = {
size = "500M";
type = "EF00";
content = { content = {
type = "filesystem"; type = "filesystem";
format = "vfat"; format = "vfat";
mountpoint = "/boot"; mountpoint = "/boot";
mountOptions = [ "umask=0077" ];
}; };
}; };
# swap = {
# size = "2G";
# content = {
# type = "swap";
# };
# };
root = { root = {
size = "100%"; size = "100%";
content = { content = {
@@ -30,6 +29,12 @@
mountpoint = "/"; mountpoint = "/";
}; };
}; };
swap = {
size = "2G";
content = {
type = "swap";
};
};
}; };
}; };
}; };
+2 -2
View File
@@ -34,11 +34,11 @@
fileSystems = { fileSystems = {
"/" = { "/" = {
device = lib.mkForce "/dev/vda2"; # "/dev/disk/by-partlabel/disk-main-root"; device = lib.mkForce "/dev/disk/by-partlabel/disk-main-root"; # "/dev/disk/by-partlabel/disk-main-root";
fsType = "ext4"; fsType = "ext4";
}; };
"/boot" = { "/boot" = {
device = lib.mkForce "/dev/vda1"; device = lib.mkForce "/dev/disk/by-partlabel/disk-main-ESP";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ]; options = [ "fmask=0022" "dmask=0022" ];
}; };
+1 -1
View File
@@ -44,7 +44,7 @@ let
loader = { loader = {
grub = { grub = {
enable = true; enable = true;
device = "/dev/vda1"; device = "nodev";
useOSProber = false; useOSProber = false;
efiSupport = false; efiSupport = false;
#efiInstallAsRemovable = true; #efiInstallAsRemovable = true;