diff options
author | lassulus <lass@blue.r> | 2018-09-04 20:53:12 +0200 |
---|---|---|
committer | lassulus <lass@blue.r> | 2018-09-04 20:53:12 +0200 |
commit | 96c4ab61202f515c7a361ef76c398e542771d6b4 (patch) | |
tree | ce2ca90d0ae800bb3ba3e1b05593e7ba7bef104c /makefu/1systems/wbob | |
parent | e183bb1c80c42131f9e3d932985e413ef457f77a (diff) | |
parent | 481376c1509661cbf1bdb17b9887b3a4f0487b6f (diff) |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/wbob')
-rw-r--r-- | makefu/1systems/wbob/config.nix | 2 | ||||
-rw-r--r-- | makefu/1systems/wbob/source.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/makefu/1systems/wbob/config.nix b/makefu/1systems/wbob/config.nix index 9d8a91e6d..e1d66a2f9 100644 --- a/makefu/1systems/wbob/config.nix +++ b/makefu/1systems/wbob/config.nix @@ -150,7 +150,7 @@ in { # rt2870 with nonfree creates wlp2s0 from wlp0s20u2 # not explicitly setting the interface results in wpa_supplicant to crash networking.wireless.interfaces = [ "wlp2s0" ]; - networking.interfaces.virbr1.ip4 = [{ + networking.interfaces.virbr1.ipv4.addresses = [{ address = "10.8.8.11"; prefixLength = 24; }]; diff --git a/makefu/1systems/wbob/source.nix b/makefu/1systems/wbob/source.nix index b768aa87d..c76f73760 100644 --- a/makefu/1systems/wbob/source.nix +++ b/makefu/1systems/wbob/source.nix @@ -1,4 +1,4 @@ -import <stockholm/makefu/source.nix> { +{ name="wbob"; # musnix = true; } |