diff --git a/lib/default.nix b/lib/default.nix index 100d679..ca0c035 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -175,11 +175,11 @@ rec { }; vm = rec { - lvmDisk' = name: lv: { + lvmDisk'' = name: vg: lv: { inherit name; backend = { driver = "host_device"; - filename = "/dev/main/${lv}"; + filename = "/dev/${vg}/${lv}"; # It appears this needs to be set on the backend _and_ the format discard = "unmap"; }; @@ -189,7 +189,8 @@ rec { }; frontend = "virtio-blk"; }; - lvmDisk = lv: lvmDisk' lv lv; + lvmDisk' = vg: lv: lvmDisk'' lv vg lv; + lvmDisk = lvmDisk' "main"; disk = vm: lv: lvmDisk' lv "vm-${vm}-${lv}"; }; diff --git a/nixos/boxes/colony/vms/shill/containers/object.nix b/nixos/boxes/colony/vms/shill/containers/object.nix index 05d0f8c..29e9a76 100644 --- a/nixos/boxes/colony/vms/shill/containers/object.nix +++ b/nixos/boxes/colony/vms/shill/containers/object.nix @@ -95,6 +95,7 @@ in shell = pkgs.bashInteractive; openssh.authorizedKeys.keyFiles = [ lib.my.c.sshKeyFiles.harmonia + lib.my.c.sshKeyFiles.me ]; }; }; diff --git a/nixos/boxes/home/palace/default.nix b/nixos/boxes/home/palace/default.nix index 665203c..b474280 100644 --- a/nixos/boxes/home/palace/default.nix +++ b/nixos/boxes/home/palace/default.nix @@ -53,7 +53,7 @@ in }; }; }); - kernelModules = [ "kvm-amd" ]; + kernelModules = [ "dm-raid" "kvm-amd" ]; kernelParams = [ "amd_iommu=on" ]; initrd = { availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "sr_mod" ]; diff --git a/nixos/boxes/home/palace/vms/default.nix b/nixos/boxes/home/palace/vms/default.nix index ea1ab00..21bb92e 100644 --- a/nixos/boxes/home/palace/vms/default.nix +++ b/nixos/boxes/home/palace/vms/default.nix @@ -186,6 +186,9 @@ mac = "52:54:00:72:67:51"; }; }; + drives = [ + (vm.lvmDisk' "hdds" "frigate") + ]; hostDevices = { et100g0vf2 = { index = 0; diff --git a/nixos/boxes/home/palace/vms/sfh/default.nix b/nixos/boxes/home/palace/vms/sfh/default.nix index 181a3d7..0a57f67 100644 --- a/nixos/boxes/home/palace/vms/sfh/default.nix +++ b/nixos/boxes/home/palace/vms/sfh/default.nix @@ -72,6 +72,10 @@ in fsType = "ext4"; neededForBoot = true; }; + "/mnt/frigate" = { + device = "/dev/disk/by-label/frigate"; + fsType = "ext4"; + }; }; networking = { inherit domain; }; @@ -194,6 +198,10 @@ in unifi = {}; hass = { bindMounts = { + "/mnt/frigate" = { + mountPoint = "/var/lib/frigate"; + readOnly = false; + }; "/dev/bus/usb/001/002".readOnly = false; "/dev/video0".readOnly = false; "/dev/serial/by-id/usb-Nabu_Casa_Home_Assistant_Connect_ZBT-1_ce549704fe38ef11a2c2e5d154516304-if00-port0" = {