diff options
| author | Profpatsch <mail@profpatsch.de> | 2017-04-26 20:55:26 +0200 |
|---|---|---|
| committer | Profpatsch <mail@profpatsch.de> | 2017-04-26 22:32:31 +0200 |
| commit | 1f998f887bdb5ad7cb187f724c3489b2f61c31bc (patch) | |
| tree | c45ee403e8a7fbb79e136ea841cdfaebe6f234f9 /machines/profpatsch | |
| parent | 14ca13c92b0a8cceb18a9f8d01a818164babf39b (diff) | |
machines/katara: switch to network-manager again
Hopefully temporarily.
Diffstat (limited to 'machines/profpatsch')
| -rw-r--r-- | machines/profpatsch/katara.nix | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/machines/profpatsch/katara.nix b/machines/profpatsch/katara.nix index a46b7303..0e884ae6 100644 --- a/machines/profpatsch/katara.nix +++ b/machines/profpatsch/katara.nix @@ -58,24 +58,25 @@ in { # Network networking.hostName = "katara"; - networking.supplicant.wlp3s0 = { - configFile = { - path = "/var/wifi-networks"; - writable = true; - }; - userControlled.enable = true; - }; - - networking.bonds = { - wifiAndEthernet = { - interfaces = [ "wlp3s0" "enp0s25" ]; - driverOptions = { - miimon = "100"; - primary = "enp0s25"; - mode = "active-backup"; - }; - }; - }; + # networking.supplicant.wlp3s0 = { + # configFile = { + # path = "/var/wifi-networks"; + # writable = true; + # }; + # userControlled.enable = true; + # }; + networking.networkmanager.enable = true; + + # networking.bonds = { + # wifiAndEthernet = { + # interfaces = [ "wlp3s0" "enp0s25" ]; + # driverOptions = { + # miimon = "100"; + # primary = "enp0s25"; + # mode = "active-backup"; + # }; + # }; + # }; ########### # Packages @@ -95,6 +96,7 @@ in { tarsnap # encrypting online backup tool # TODO move into atool deps unzip # extract zip archives + networkmanagerapplet wpa_supplicant_gui # configure wireless connections ]; xPkgs = [ |