From 8ba0636172ecee2742c8d18ffd21d329c48f617b Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 25 Apr 2016 01:51:57 +0200
Subject: modules/labtops: simplify wireless connection

---
 machines/labnet/labtop.nix       | 11 -----------
 modules/user/openlab/labtops.nix |  5 ++++-
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/machines/labnet/labtop.nix b/machines/labnet/labtop.nix
index 7cc90db7..956b0377 100644
--- a/machines/labnet/labtop.nix
+++ b/machines/labnet/labtop.nix
@@ -1,6 +1,5 @@
 { lib }:
 let
-  compose = f: g: x: f (g x);
   callMachine = import ../../lib/call-machine.nix;
   mkLabtop = hostname: config: {
     vuizvui.user.openlab.labtops.enable = true;
@@ -39,16 +38,6 @@ let
       fsType = "ext4";
     };
 
-    networking.wireless = {
-      interfaces = [ "wlp2s0" ];
-    };
-    environment.etc."wpa_supplicant.conf".text = ''
-      network={
-      	ssid="Labor 2.0"
-      	#psk="nerdhoehle2"
-      	psk=5d925de5243d3a77a86e803ff6ac1f02ce7e1606f23bdb3d8ca60d90f26e8684
-      }
-    '';
   };
 
 in
diff --git a/modules/user/openlab/labtops.nix b/modules/user/openlab/labtops.nix
index 26a08a22..9b188f5d 100644
--- a/modules/user/openlab/labtops.nix
+++ b/modules/user/openlab/labtops.nix
@@ -84,8 +84,11 @@ in
 
     services.openssh.enable = true;
 
-    networking.networkmanager.enable = true;
     networking.firewall.enable = false;
+    networking.wireless = {
+      enable = true;
+      networks."Labor 2.0".psk = "nerdhoehle2";
+    };
 
     # TODO: an argument that tells about hardware capability
     nix.maxJobs = 2;
-- 
cgit 1.4.1