diff options
author | tv <tv@krebsco.de> | 2018-12-18 20:39:36 +0100 |
---|---|---|
committer | tv <tv@krebsco.de> | 2018-12-18 20:39:36 +0100 |
commit | f89f99011d77e53cc0729d2cf735ea2adb45ef22 (patch) | |
tree | 63c5c053464f26360bd46fe40e2bfea031d2730d /tv/1systems | |
parent | 1fa1fa53062069de970548f88ad0211b4502f18d (diff) |
tv: enable networking.wireless in systems
Diffstat (limited to 'tv/1systems')
-rw-r--r-- | tv/1systems/alnus/config.nix | 4 | ||||
-rw-r--r-- | tv/1systems/mu/config.nix | 4 | ||||
-rw-r--r-- | tv/1systems/nomic/config.nix | 2 | ||||
-rw-r--r-- | tv/1systems/wu/config.nix | 2 | ||||
-rw-r--r-- | tv/1systems/xu/config.nix | 2 | ||||
-rw-r--r-- | tv/1systems/zu/config.nix | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix index 001ad0bc4..949a98b2a 100644 --- a/tv/1systems/alnus/config.nix +++ b/tv/1systems/alnus/config.nix @@ -8,10 +8,6 @@ with import <stockholm/lib>; <stockholm/tv/2configs/retiolum.nix> ]; - # TODO remove non-hardware stuff from ../2configs/hw/x220.nix - # networking.wireless.enable collides with networkmanager - networking.wireless.enable = mkForce false; - boot = { initrd = { availableKernelModules = [ "ahci" ]; diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix index be8d90940..f1cd7d673 100644 --- a/tv/1systems/mu/config.nix +++ b/tv/1systems/mu/config.nix @@ -6,10 +6,6 @@ with import <stockholm/lib>; <stockholm/tv/2configs/br.nix> <stockholm/tv/2configs/exim-retiolum.nix> <stockholm/tv/2configs/hw/x220.nix> - { - # Override x220.nix as we're using networkmanager here. - networking.wireless.enable = mkForce false; - } <stockholm/tv/2configs/retiolum.nix> ]; diff --git a/tv/1systems/nomic/config.nix b/tv/1systems/nomic/config.nix index 996a5e7ec..a89f07e8a 100644 --- a/tv/1systems/nomic/config.nix +++ b/tv/1systems/nomic/config.nix @@ -64,4 +64,6 @@ with import <stockholm/lib>; gnupg tmux ]; + + networking.wireless.enable = true; } diff --git a/tv/1systems/wu/config.nix b/tv/1systems/wu/config.nix index 17eeff5da..4c491d65b 100644 --- a/tv/1systems/wu/config.nix +++ b/tv/1systems/wu/config.nix @@ -41,6 +41,8 @@ with import <stockholm/lib>; }; }; + networking.wireless.enable = true; + services.printing.enable = true; services.udev.extraRules = '' diff --git a/tv/1systems/xu/config.nix b/tv/1systems/xu/config.nix index 5421cab92..b9c76cf49 100644 --- a/tv/1systems/xu/config.nix +++ b/tv/1systems/xu/config.nix @@ -147,6 +147,8 @@ with import <stockholm/lib>; gptfdisk ]; + networking.wireless.enable = true; + #services.bitlbee.enable = true; #services.tor.client.enable = true; #services.tor.enable = true; diff --git a/tv/1systems/zu/config.nix b/tv/1systems/zu/config.nix index 414d2f226..bbfcfafc1 100644 --- a/tv/1systems/zu/config.nix +++ b/tv/1systems/zu/config.nix @@ -44,6 +44,8 @@ with import <stockholm/lib>; }; }; + networking.wireless.enable = true; + services.printing.enable = true; #services.bitlbee.enable = true; |