diff options
author | tv <tv@krebsco.de> | 2020-06-02 23:35:17 +0200 |
---|---|---|
committer | tv <tv@krebsco.de> | 2020-06-02 23:35:17 +0200 |
commit | 09c9f8f7fb04be39390b6f65966789c1bf6333e5 (patch) | |
tree | b0cb0f718b40517b0645a38169e67b1088566f64 /makefu/1systems/x/config.nix | |
parent | 09e620c79b70e495e9651e8e5c1b160dd1b5fb8d (diff) | |
parent | 211e2ca6b9a1d8b4dd92071065b0b595123fe282 (diff) |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu/1systems/x/config.nix')
-rw-r--r-- | makefu/1systems/x/config.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix index 4c479875..4e6706b2 100644 --- a/makefu/1systems/x/config.nix +++ b/makefu/1systems/x/config.nix @@ -19,7 +19,9 @@ <stockholm/makefu/2configs/tools/all.nix> { programs.adb.enable = true; } + { systemd.services.docker.wantedBy = lib.mkForce []; } <stockholm/makefu/2configs/dict.nix> + <stockholm/makefu/2configs/legacy_only.nix> #<stockholm/makefu/3modules/netboot_server.nix> #{ # netboot_server = { @@ -162,7 +164,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; |