about summary refs log tree commit diff
path: root/machines/profpatsch/katara.nix
diff options
context:
space:
mode:
Diffstat (limited to 'machines/profpatsch/katara.nix')
-rw-r--r--machines/profpatsch/katara.nix20
1 files changed, 9 insertions, 11 deletions
diff --git a/machines/profpatsch/katara.nix b/machines/profpatsch/katara.nix
index dea63757..a77c493f 100644
--- a/machines/profpatsch/katara.nix
+++ b/machines/profpatsch/katara.nix
@@ -54,19 +54,17 @@ in {
     ##########
     # Network
 
-    networking.hostName = "katara";
+    networking.useNetworkd = true;
 
-    networking.networkmanager.basePackages =
-      with pkgs; {
-        # the openssl backend doesn’t like the protocols of my university
-        networkmanager_openconnect =
-          pkgs.networkmanager_openconnect.override { openconnect = pkgs.openconnect_gnutls; };
-        inherit networkmanager modemmanager wpa_supplicant
-                networkmanager_openvpn networkmanager_vpnc
-                networkmanager_pptp networkmanager_l2tp;
+    networking.hostName = "katara";
+    networking.supplicant.wlp3s0 = {
+      configFile = {
+        path = "/var/wifi-networks";
+        writable = true;
+      };
+      userControlled.enable = true;
     };
 
-
     ###########
     # Packages
 
@@ -84,6 +82,7 @@ in {
         tarsnap           # encrypting online backup tool
         # TODO move into atool deps
         unzip             # extract zip archives
+        wpa_supplicant_gui  # configure wireless connections
       ];
       xPkgs = [
         dmenu             # simple UI menu builder
@@ -99,7 +98,6 @@ in {
         # TODO: get themes to work. See notes.org.
         gnome3.gnome_themes_standard
         pavucontrol
-        networkmanagerapplet
       ];
       hp = haskellPackages;
       programmingTools = [