diff options
| author | Profpatsch <mail@profpatsch.de> | 2017-02-04 12:44:14 +0100 |
|---|---|---|
| committer | Profpatsch <mail@profpatsch.de> | 2017-02-04 12:48:46 +0100 |
| commit | b44725e97628e4e2e5059914473a86b87ee14561 (patch) | |
| tree | 449b6c5d15bf297881e01598240f468f3db1d365 /machines | |
| parent | 2de5598aace2ac5afac7969407aaafb0d3f965cb (diff) | |
machines/katara: switch to wpa_supplicant
nm got so slow, it’s unbearable.
Diffstat (limited to 'machines')
| -rw-r--r-- | machines/profpatsch/base-workstation.nix | 2 | ||||
| -rw-r--r-- | machines/profpatsch/katara.nix | 20 |
2 files changed, 9 insertions, 13 deletions
diff --git a/machines/profpatsch/base-workstation.nix b/machines/profpatsch/base-workstation.nix index ae9fa7a0..15897f3d 100644 --- a/machines/profpatsch/base-workstation.nix +++ b/machines/profpatsch/base-workstation.nix @@ -20,9 +20,7 @@ in { }; networking = { - wireless.enable = false; firewall.enable = false; - networkmanager.enable = true; }; i18n = { 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 = [ |