diff options
author | lassulus <lass@aidsballs.de> | 2016-06-13 12:54:15 +0200 |
---|---|---|
committer | lassulus <lass@aidsballs.de> | 2016-06-13 12:54:15 +0200 |
commit | b244441223ac192926da8465dea3273c225bbd68 (patch) | |
tree | b688576b2219b6aefc5663f7d227016a590fc194 /makefu/1systems/pornocauster.nix | |
parent | f832a63ce045823c1aeafec48fbe32b78ed7cd6d (diff) | |
parent | b9c0c46b4d0f9907f1b3fc96494be96abc60c8db (diff) |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/pornocauster.nix')
-rw-r--r-- | makefu/1systems/pornocauster.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix index fa39b121c..2fb93798a 100644 --- a/makefu/1systems/pornocauster.nix +++ b/makefu/1systems/pornocauster.nix @@ -31,6 +31,7 @@ # hardware specifics are in here ../2configs/hw/tp-x220.nix + ../2configs/hw/rtl8812au.nix # mount points ../2configs/fs/sda-crypto-root-home.nix # ../2configs/mediawiki.nix @@ -59,7 +60,6 @@ networking.firewall.allowedUDPPorts = [ 665 ]; krebs.build.host = config.krebs.hosts.pornocauster; - krebs.hosts.omo.nets.retiolum.via.ip4.addr = "192.168.1.11"; krebs.retiolum = { enable = true; @@ -68,4 +68,6 @@ networking.extraHosts = '' 192.168.1.11 omo.local ''; + # hard dependency because otherwise the device will not be unlocked + boot.initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; allowDiscards=true; }]; } |