summaryrefslogtreecommitdiffstats
path: root/makefu/1systems
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2020-04-22 23:40:07 +0200
committermakefu <github@syntax-fehler.de>2020-04-22 23:40:07 +0200
commit3e6850f128edf0c75437c63ae654f1f524061720 (patch)
treec7b4a959d07ea4a580eae4ae880faa2aeba68b52 /makefu/1systems
parentccc3126b1071d57e9285ca4fc4013e83e8a4081d (diff)
ma x.r: re-enable virtualbox, fix warning
Diffstat (limited to 'makefu/1systems')
-rw-r--r--makefu/1systems/x/config.nix8
1 files changed, 6 insertions, 2 deletions
diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix
index 169f32c16..ea92e3485 100644
--- a/makefu/1systems/x/config.nix
+++ b/makefu/1systems/x/config.nix
@@ -71,7 +71,7 @@
# Virtualization
# <stockholm/makefu/2configs/virtualisation/libvirt.nix>
<stockholm/makefu/2configs/virtualisation/docker.nix>
- #<stockholm/makefu/2configs/virtualisation/virtualbox.nix>
+ <stockholm/makefu/2configs/virtualisation/virtualbox.nix>
#{
# networking.firewall.allowedTCPPorts = [ 8080 ];
# networking.nat = {
@@ -162,7 +162,11 @@
krebs.tinc.retiolum.connectTo = [ "omo" "prism" "nextgum" "wbob" ];
# hard dependency because otherwise the device will not be unlocked
- boot.initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; allowDiscards=true; }];
+ boot.initrd.luks.devices.luksroot =
+ {
+ device = "/dev/sda2";
+ allowDiscards = true;
+ };
# avoid full boot dir
boot.loader.grub.configurationLimit = 3;