diff options
| author | makefu <github@syntax-fehler.de> | 2017-01-25 23:23:29 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2017-01-25 23:23:29 +0100 |
| commit | bf405736962fd20df738f84665e5fc7f8d74e72d (patch) | |
| tree | ae01054fe88089d6476b3c1b1952066fd6c79092 /tv/1systems/wu.nix | |
| parent | 7e1bd2729e11e5c63749c69093359de0bb3329b2 (diff) | |
| parent | 89c5b22129d3cb875d16a3171a4e3ab3bee9cb0a (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'tv/1systems/wu.nix')
| -rw-r--r-- | tv/1systems/wu.nix | 15 |
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; } |