diff --git a/nixos/boxes/colony/vms/default.nix b/nixos/boxes/colony/vms/default.nix index 665723b..6d8d9d1 100644 --- a/nixos/boxes/colony/vms/default.nix +++ b/nixos/boxes/colony/vms/default.nix @@ -139,19 +139,19 @@ (mkMerge [ (vmLVM "shill" "esp") { frontendOpts.bootindex = 0; } ]) (vmLVM "shill" "nix") (vmLVM "shill" "persist") - # { - # name = "media"; - # backend = { - # driver = "host_device"; - # filename = "/dev/main/media"; - # discard = "unmap"; - # }; - # format = { - # driver = "raw"; - # discard = "unmap"; - # }; - # frontend = "virtio-blk"; - # } + { + name = "media"; + backend = { + driver = "host_device"; + filename = "/dev/main/media"; + discard = "unmap"; + }; + format = { + driver = "raw"; + discard = "unmap"; + }; + frontend = "virtio-blk"; + } { name = "minio"; backend = { diff --git a/nixos/boxes/colony/vms/shill/default.nix b/nixos/boxes/colony/vms/shill/default.nix index 3475c3f..5f22db4 100644 --- a/nixos/boxes/colony/vms/shill/default.nix +++ b/nixos/boxes/colony/vms/shill/default.nix @@ -76,10 +76,10 @@ fsType = "ext4"; neededForBoot = true; }; - # "/mnt/media" = { - # device = "/dev/disk/by-label/media"; - # fsType = "ext4"; - # }; + "/mnt/media" = { + device = "/dev/disk/by-label/media"; + fsType = "ext4"; + }; "/mnt/minio" = { device = "/dev/disk/by-label/minio"; fsType = "xfs"; @@ -134,7 +134,6 @@ }; }; - systemd.services."systemd-nspawn@jackflix".enable = false; my = { secrets.key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ6bc1pQCYalLXdB4X+7kFXtkTdFalbH5rchjuYj2ceU"; server.enable = true;