diff options
author | tv <tv@krebsco.de> | 2020-04-17 19:21:16 +0200 |
---|---|---|
committer | tv <tv@krebsco.de> | 2020-04-17 19:21:16 +0200 |
commit | e1bfdd8d839929538d36e421908a96407b3aa0ab (patch) | |
tree | 557bf9a711f06997e846a5ef14a4105248f1da8c /makefu/1systems/x | |
parent | 6ace0f7b6941c1c9476d84944cdba8bedf98d95d (diff) | |
parent | 07f18d851a974ee594c92e3332f167ef3b1d259f (diff) |
Merge remote-tracking branch 'prism/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"; |