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

nixos/colony: Move to new thin pool for NVMe

Browse Source
This commit is contained in:
Jack O'Sullivan 2023-02-19 16:47:13 +00:00
parent c2634aff55
commit f17ed65cb8
3 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,6 +62,7 @@
kernelModules = [ "kvm-amd" ]; kernelModules = [ "kvm-amd" ];
kernelParams = [ "amd_iommu=on" "console=ttyS0,115200n8" "console=ttyS1,115200n8" "console=tty0" ]; kernelParams = [ "amd_iommu=on" "console=ttyS0,115200n8" "console=ttyS1,115200n8" "console=tty0" ];
initrd = { initrd = {
kernelModules = [ "dm-raid" ];
availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "sr_mod" ]; availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "sr_mod" ];
}; };
}; };
@ -72,11 +73,11 @@
fsType = "vfat"; fsType = "vfat";
}; };
"/nix" = { "/nix" = {
device = "/dev/hdds/tmp-colony-nix"; device = "/dev/main/colony-nix";
fsType = "ext4"; fsType = "ext4";
}; };
"/persist" = { "/persist" = {
device = "/dev/hdds/tmp-colony-persist"; device = "/dev/main/colony-persist";
fsType = "ext4"; fsType = "ext4";
neededForBoot = true; neededForBoot = true;
}; };

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

@ -14,7 +14,7 @@
name = lv; name = lv;
backend = { backend = {
driver = "host_device"; driver = "host_device";
filename = "/dev/hdds/tmp-vm-${vm}-${lv}"; filename = "/dev/main/vm-${vm}-${lv}";
# It appears this needs to be set on the backend _and_ the format # It appears this needs to be set on the backend _and_ the format
discard = "unmap"; discard = "unmap";
}; };
@ -139,24 +139,24 @@
(mkMerge [ (vmLVM "shill" "esp") { frontendOpts.bootindex = 0; } ]) (mkMerge [ (vmLVM "shill" "esp") { frontendOpts.bootindex = 0; } ])
(vmLVM "shill" "nix") (vmLVM "shill" "nix")
(vmLVM "shill" "persist") (vmLVM "shill" "persist")
{ # {
name = "media"; # name = "media";
backend = { # backend = {
driver = "host_device"; # driver = "host_device";
filename = "/dev/hdds/media"; # filename = "/dev/main/media";
discard = "unmap"; # discard = "unmap";
}; # };
format = { # format = {
driver = "raw"; # driver = "raw";
discard = "unmap"; # discard = "unmap";
}; # };
frontend = "virtio-blk"; # frontend = "virtio-blk";
} # }
{ {
name = "minio"; name = "minio";
backend = { backend = {
driver = "host_device"; driver = "host_device";
filename = "/dev/hdds/tmp-minio"; filename = "/dev/main/minio";
discard = "unmap"; discard = "unmap";
}; };
format = { format = {
@ -186,7 +186,7 @@
name = "oci"; name = "oci";
backend = { backend = {
driver = "host_device"; driver = "host_device";
filename = "/dev/hdds/tmp-oci"; filename = "/dev/main/oci";
discard = "unmap"; discard = "unmap";
}; };
format = { format = {

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

@ -76,10 +76,10 @@
fsType = "ext4"; fsType = "ext4";
neededForBoot = true; neededForBoot = true;
}; };
"/mnt/media" = { # "/mnt/media" = {
device = "/dev/disk/by-label/media"; # device = "/dev/disk/by-label/media";
fsType = "ext4"; # fsType = "ext4";
}; # };
"/mnt/minio" = { "/mnt/minio" = {
device = "/dev/disk/by-label/minio"; device = "/dev/disk/by-label/minio";
fsType = "xfs"; fsType = "xfs";
@ -134,6 +134,7 @@
}; };
}; };
systemd.services."systemd-nspawn@jackflix".enable = false;
my = { my = {
secrets.key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ6bc1pQCYalLXdB4X+7kFXtkTdFalbH5rchjuYj2ceU"; secrets.key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ6bc1pQCYalLXdB4X+7kFXtkTdFalbH5rchjuYj2ceU";
server.enable = true; server.enable = true;