diff options
author | lassulus <lassulus@lassul.us> | 2018-03-18 22:28:59 +0100 |
---|---|---|
committer | lassulus <lassulus@lassul.us> | 2018-03-18 22:28:59 +0100 |
commit | 3b8f52f4f0ae93a5e9818e784e7f4507f72aa11e (patch) | |
tree | da6fa3e2d60ab2025cb3480f3b1621154bbed076 /makefu/1systems/x/config.nix | |
parent | ce32c7b6d4352ac193d60100d632615c25c0198e (diff) | |
parent | 28324a02d902b0ca31a383f162c585fb8f9b2972 (diff) |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/x/config.nix')
-rw-r--r-- | makefu/1systems/x/config.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix index ad2ad877..f72f2a15 100644 --- a/makefu/1systems/x/config.nix +++ b/makefu/1systems/x/config.nix @@ -11,6 +11,8 @@ with import <stockholm/lib>; <stockholm/makefu/2configs/main-laptop.nix> <stockholm/makefu/2configs/extra-fonts.nix> <stockholm/makefu/2configs/tools/all.nix> + <stockholm/makefu/2configs/tools/mic92.nix> + <stockholm/makefu/2configs/laptop-backup.nix> <stockholm/makefu/2configs/dnscrypt/client.nix> <stockholm/makefu/2configs/avahi.nix> @@ -27,6 +29,8 @@ with import <stockholm/lib>; # <stockholm/makefu/2configs/vncserver.nix> # <stockholm/makefu/2configs/deployment/led-fader> # <stockholm/makefu/2configs/deployment/hound> + # <stockholm/makefu/2configs/deployment/photostore.krebsco.de.nix> + # <stockholm/makefu/2configs/deployment/bureautomation/hass.nix> # Krebs <stockholm/makefu/2configs/tinc/retiolum.nix> @@ -40,7 +44,7 @@ with import <stockholm/lib>; # Virtualization <stockholm/makefu/2configs/virtualisation/libvirt.nix> <stockholm/makefu/2configs/virtualisation/docker.nix> - # <stockholm/makefu/2configs/virtualisation/virtualbox.nix> + <stockholm/makefu/2configs/virtualisation/virtualbox.nix> { networking.firewall.allowedTCPPorts = [ 8080 ]; networking.nat = { @@ -78,7 +82,6 @@ with import <stockholm/lib>; # <stockholm/makefu/2configs/lanparty/lancache-dns.nix> # <stockholm/makefu/2configs/lanparty/samba.nix> # <stockholm/makefu/2configs/lanparty/mumble-server.nix> - # <stockholm/makefu/2configs/deployment/photostore.krebsco.de.nix> { networking.wireguard.interfaces.wg0 = { @@ -123,6 +126,7 @@ with import <stockholm/lib>; load-module module-filter-heuristics load-module module-filter-apply load-module module-switch-on-connect + load-module module-switch-on-port-available ''; }; |