diff --git a/devices/.vds.nix.kate-swp b/devices/.vds.nix.kate-swp deleted file mode 100644 index 8eb314c..0000000 Binary files a/devices/.vds.nix.kate-swp and /dev/null differ diff --git a/devices/disko/vds.nix b/devices/disko/vds.nix index 7cdd00e..4260e59 100644 --- a/devices/disko/vds.nix +++ b/devices/disko/vds.nix @@ -7,15 +7,15 @@ content = { type = "gpt"; partitions = { - # ESP = { - # type = "EF00"; - # size = "512M"; - # content = { - # type = "filesystem"; - # format = "vfat"; - # mountpoint = "/boot"; - # }; - # }; + ESP = { + type = "EF02"; + size = "512M"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + }; + }; # swap = { # size = "2G"; # content = { diff --git a/devices/hardware/vds.nix b/devices/hardware/vds.nix index 0c3ceef..c8500be 100755 --- a/devices/hardware/vds.nix +++ b/devices/hardware/vds.nix @@ -34,27 +34,16 @@ fileSystems = { "/" = { - device = lib.mkForce "/dev/vda1"; # "/dev/disk/by-partlabel/disk-main-root"; + device = lib.mkForce "/dev/vda2"; # "/dev/disk/by-partlabel/disk-main-root"; fsType = "ext4"; }; + "/boot" = { + device = lib.mkForce "/dev/vda1"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; }; - # fileSystems."/" = - # { device = "/dev/disk/by-uuid/8acccc34-edc6-4934-886c-ef4b778ca24a"; - # fsType = "ext4"; - # }; - # - # fileSystems."/boot" = - # { device = "/dev/disk/by-uuid/DDF2-C940"; - # fsType = "vfat"; - # options = [ "fmask=0022" "dmask=0022" ]; - # }; - # - # fileSystems."/home/otreca/External" = - # { device = "/dev/disk/by-uuid/37e53ebc-5343-a94d-9fe2-0ca39e13a8de"; - # fsType = "ext4"; - # }; - # swapDevices = [ # { device = "/dev/disk/by-partlabel/disk-main-swap"; } # ];