summaryrefslogtreecommitdiffstats
path: root/tv/1systems
diff options
context:
space:
mode:
authorlassulus <lass@lassul.us>2017-01-16 16:31:07 +0100
committerlassulus <lass@lassul.us>2017-01-16 16:31:07 +0100
commitc4bd028470ee542ad56dad16f984981a8e5fd37b (patch)
tree6e5e0e105f62239ef8ff6086a58cc3813ac46901 /tv/1systems
parent920c79eb9eb5bb94f55d394f40a909c49448b3e6 (diff)
parent08fd9d3ae398f6b7158d05be0bfd0122da4d4e98 (diff)
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'tv/1systems')
-rw-r--r--tv/1systems/wu.nix15
1 files changed, 9 insertions, 6 deletions
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index d5be57bb8..a9d7e94eb 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -23,7 +23,6 @@ with import <stockholm/lib>;
# stockholm
gnumake
hashPassword
- haskellPackages.lentil
parallel
# root
@@ -47,7 +46,6 @@ with import <stockholm/lib>;
p7zip
push
qrencode
- texLive
tmux
#ack
@@ -116,18 +114,23 @@ with import <stockholm/lib>;
boot.initrd.luks = {
cryptoModules = [ "aes" "sha512" "xts" ];
devices = [
- { name = "home"; device = "/dev/vg840/enchome"; preLVM = false; }
+ { name = "wuca"; device = "/dev/sda2"; }
];
};
fileSystems = {
"/" = {
- device = "/dev/mapper/vg840-wuroot";
+ device = "/dev/mapper/wuvga-root";
+ fsType = "btrfs";
+ options = ["defaults" "noatime" "ssd" "compress=lzo"];
+ };
+ "/bku" = {
+ device = "/dev/mapper/wuvga-bku";
fsType = "btrfs";
options = ["defaults" "noatime" "ssd" "compress=lzo"];
};
"/home" = {
- device = "/dev/mapper/home";
+ device = "/dev/mapper/wuvga-home";
fsType = "btrfs";
options = ["defaults" "noatime" "ssd" "compress=lzo"];
};
@@ -174,5 +177,5 @@ with import <stockholm/lib>;
KERNEL=="hpet", GROUP="audio"
'';
- services.virtualboxHost.enable = true;
+ virtualisation.virtualbox.host.enable = true;
}