dev/nixfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

nixos: Disk layout cleanup

Browse Source
This commit is contained in:
Jack O'Sullivan 2022-06-06 15:53:57 +01:00
parent 6d3fa55a10
commit 4c2019299c
4 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/boxes/colony/default.nix
View File

@ -37,7 +37,7 @@
boot.loader.systemd-boot.configurationLimit = 20;
fileSystems = {
"/boot" = {
device = "/dev/disk/by-label/ESP";
device = "/dev/disk/by-uuid/83CA-3BCF";
fsType = "vfat";
};
"/nix" = {
@ -59,6 +59,7 @@
environment.systemPackages = with pkgs; [
pciutils
partclone
];
systemd = {

22
nixos/boxes/colony/vms/default.nix
View File

@ -38,22 +38,12 @@
waitOnline = "no-carrier";
mac = "52:54:00:ab:f1:52";
};
drives = {
# TODO: Split into separate LVs
disk = mkIf (!config.my.build.isDevVM) {
backend = {
driver = "host_device";
filename = "/dev/ssds/vm-estuary";
# It appears this needs to be set on the backend _and_ the format
discard = "unmap";
};
format = {
driver = "raw";
discard = "unmap";
};
frontend = "virtio-blk";
};
};
drives = mkMerge ([ ] ++ (optionals (!config.my.build.isDevVM) [
(vmLVM "estuary" "esp")
(vmLVM "estuary" "nix")
(vmLVM "estuary" "persist")
{ esp.frontendOpts.bootindex = 0; }
]));
hostDevices."${wanBDF}" = { };
};
shill = {

4
nixos/boxes/colony/vms/estuary/default.nix
View File

@ -45,11 +45,11 @@
fsType = "vfat";
};
"/nix" = {
device = "/dev/main/nix";
device = "/dev/disk/by-label/nix";
fsType = "ext4";
};
"/persist" = {
device = "/dev/main/persist";
device = "/dev/disk/by-label/persist";
fsType = "ext4";
neededForBoot = true;
};

4
nixos/boxes/colony/vms/shill/default.nix
View File

@ -43,11 +43,11 @@
fsType = "vfat";
};
"/nix" = {
device = "/dev/vdb";
device = "/dev/disk/by-label/nix";
fsType = "ext4";
};
"/persist" = {
device = "/dev/vdc";
device = "/dev/disk/by-label/persist";
fsType = "ext4";
neededForBoot = true;
};