diff options
author | lassulus <lassulus@lassul.us> | 2020-03-23 10:15:42 +0100 |
---|---|---|
committer | lassulus <lassulus@lassul.us> | 2020-03-23 10:15:42 +0100 |
commit | 8c27f12f86096f06e56333125eb6c713aece34ed (patch) | |
tree | 83d29ab23719468ff6e8d31f29963dd449edbef2 /makefu/1systems/x | |
parent | cab3be8a19d445d3292454099dbc1ca97bca60c5 (diff) | |
parent | 8e3cd9fcffc473706a3ebafa5cb80f7a75c29aa5 (diff) |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/x')
-rw-r--r-- | makefu/1systems/x/config.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix index ea18c68ac..4c479875e 100644 --- a/makefu/1systems/x/config.nix +++ b/makefu/1systems/x/config.nix @@ -58,7 +58,7 @@ # Krebs <stockholm/makefu/2configs/tinc/retiolum.nix> - <stockholm/makefu/2configs/share/gum-client.nix> + # <stockholm/makefu/2configs/share/gum-client.nix> # <stockholm/makefu/2configs/share/temp-share-samba.nix> @@ -103,6 +103,7 @@ # <stockholm/makefu/2configs/hw/malduino_elite.nix> <stockholm/makefu/2configs/hw/switch.nix> # <stockholm/makefu/2configs/hw/rad1o.nix> + <stockholm/makefu/2configs/hw/cc2531.nix> <stockholm/makefu/2configs/hw/smartcard.nix> <stockholm/makefu/2configs/hw/upower.nix> @@ -142,7 +143,6 @@ ]; }; } - ]; makefu.server.primary-itf = "wlp3s0"; |