commit 94e6323de09f028bbf9186272cc00b6b5b6521a0 · pyrox.dev/nixpkgs

+12 -2

nixos/doc/manual/configuration/wireless.xml

···

       18
       18
        
       networking.wireless.enable = true;

     

       19
       19
        
       </programlisting>

     

       20
       20
        
       

     

       21
       21
       -
       NixOS currently does not generate wpa_supplicant's

     

       22
       22
       -
       configuration file, <literal>/etc/wpa_supplicant.conf</literal>. You should edit this file

     

       21
       21
       +
       NixOS lets you specify networks for wpa_supplicant declaratively:

     

       22
       22
       +
       <programlisting>

     

       23
       23
       +
       networking.wireless.networks = {

     

       24
       24
       +
         echelon = {

     

       25
       25
       +
           psk = "abcdefgh";

     

       26
       26
       +
         };

     

       27
       27
       +
         "free.wifi" = {};

     

       28
       28
       +
       }

     

       29
       29
       +
       </programlisting>

     

       30
       30
       +
       

     

       31
       31
       +
       When no networks are set it will default to using a configuration file at

     

       32
       32
       +
       <literal>/etc/wpa_supplicant.conf</literal>. You should edit this file

     

       23
       33
        
       yourself to define wireless networks, WPA keys and so on (see

     

       24
       34
        
       wpa_supplicant.conf(5)).

     

       25
       35
        
       </para>

+75 -85

nixos/modules/services/networking/wpa_supplicant.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
       -
       

     

       7
       6
        
         cfg = config.networking.wireless;

     

       8
       8
       -
         configFile = "/etc/wpa_supplicant.conf";

     

       9
       9
       -
       

     

       10
       10
       -
         ifaces =

     

       11
       11
       -
           cfg.interfaces ++

     

       12
       12
       -
           optional (config.networking.WLANInterface != "") config.networking.WLANInterface;

     

       13
       13
       -
       

     

       14
       14
       -
       in

     

       15
       15
       -
       

     

       16
       16
       -
       {

     

       17
       17
       -
       

     

       18
       18
       -
         ###### interface

     

       19
       19
       -
       

     

       7
       7
       +
         configFile = if cfg.networks != {} then pkgs.writeText "wpa_supplicant.conf" ''

     

       8
       8
       +
           ${optionalString cfg.userControlled.enable ''

     

       9
       9
       +
             ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=${cfg.userControlled.group}

     

       10
       10
       +
             update_config=1''}

     

       11
       11
       +
           ${concatStringsSep "\n" (mapAttrsToList (ssid: networkConfig: ''

     

       12
       12
       +
             network={

     

       13
       13
       +
               ssid="${ssid}"

     

       14
       14
       +
               ${optionalString (networkConfig.psk != null) ''psk="${networkConfig.psk}"''}

     

       15
       15
       +
               ${optionalString (networkConfig.psk == null) ''key_mgmt=NONE''}

     

       16
       16
       +
             }

     

       17
       17
       +
           '') cfg.networks)}

     

       18
       18
       +
         '' else "/etc/wpa_supplicant.conf";

     

       19
       19
       +
       in {

     

       20
       20
        
         options = {

     

       21
       21
       -
       

     

       22
       22
       -
           networking.WLANInterface = mkOption {

     

       23
       23
       -
             default = "";

     

       24
       24
       -
             description = "Obsolete. Use <option>networking.wireless.interfaces</option> instead.";

     

       25
       25
       -
           };

     

       26
       26
       -
       

     

       27
       21
        
           networking.wireless = {

     

       28
       28
       -
             enable = mkOption {

     

       29
       29
       -
               type = types.bool;

     

       30
       30
       -
               default = false;

     

       31
       31
       -
               description = ''

     

       32
       32
       -
                 Whether to start <command>wpa_supplicant</command> to scan for

     

       33
       33
       -
                 and associate with wireless networks.  Note: NixOS currently

     

       34
       34
       -
                 does not manage <command>wpa_supplicant</command>'s

     

       35
       35
       -
                 configuration file, <filename>${configFile}</filename>.  You

     

       36
       36
       -
                 should edit this file yourself to define wireless networks,

     

       37
       37
       -
                 WPA keys and so on (see

     

       38
       38
       -
                 <citerefentry><refentrytitle>wpa_supplicant.conf</refentrytitle>

     

       39
       39
       -
                 <manvolnum>5</manvolnum></citerefentry>), or use

     

       40
       40
       -
                 networking.wireless.userControlled.* to allow users to add entries

     

       41
       41
       -
                 through <command>wpa_cli</command> and <command>wpa_gui</command>.

     

       42
       42
       -
               '';

     

       43
       43
       -
             };

     

       22
       22
       +
             enable = mkEnableOption "wpa_supplicant";

     

       44
       23
        
       

     

       45
       24
        
             interfaces = mkOption {

     

       46
       25
        
               type = types.listOf types.str;

     

       47
       26
        
               default = [];

     

       48
       27
        
               example = [ "wlan0" "wlan1" ];

     

       49
       28
        
               description = ''

     

       50
       50
       -
                 The interfaces <command>wpa_supplicant</command> will use.  If empty, it will

     

       29
       29
       +
                 The interfaces <command>wpa_supplicant</command> will use. If empty, it will

     

       51
       30
        
                 automatically use all wireless interfaces.

     

       52
       31
        
               '';

     

       53
       32
        
             };

     
···

       58
       37
        
               description = "Force a specific wpa_supplicant driver.";

     

       59
       38
        
             };

     

       60
       39
        
       

     

       40
       40
       +
             networks = mkOption {

     

       41
       41
       +
               type = types.attrsOf (types.submodule {

     

       42
       42
       +
                 options = {

     

       43
       43
       +
                   psk = mkOption {

     

       44
       44
       +
                     type = types.nullOr types.str;

     

       45
       45
       +
                     default = null;

     

       46
       46
       +
                     description = ''

     

       47
       47
       +
                       The network's pre-shared key in plaintext defaulting

     

       48
       48
       +
                       to being a network without any authentication.

     

       49
       49
       +
                     '';

     

       50
       50
       +
                   };

     

       51
       51
       +
                 };

     

       52
       52
       +
               });

     

       53
       53
       +
               description = ''

     

       54
       54
       +
                 The network definitions to automatically connect to when

     

       55
       55
       +
                  <command>wpa_supplicant</command> is running. If this

     

       56
       56
       +
                  parameter is left empty wpa_supplicant will use

     

       57
       57
       +
                 /etc/wpa_supplicant.conf as the configuration file.

     

       58
       58
       +
               '';

     

       59
       59
       +
               default = {};

     

       60
       60
       +
               example = literalExample ''

     

       61
       61
       +
                 echelon = {

     

       62
       62
       +
                   psk = "abcdefgh";

     

       63
       63
       +
                 };

     

       64
       64
       +
                 "free.wifi" = {};

     

       65
       65
       +
               '';

     

       66
       66
       +
             };

     

       67
       67
       +
       

     

       61
       68
        
             userControlled = {

     

       62
       69
        
               enable = mkOption {

     

       63
       70
        
                 type = types.bool;

     
···

       68
       75
        
                   to depend on a large package such as NetworkManager just to pick nearby

     

       69
       76
        
                   access points.

     

       70
       77
        
       

     

       71
       71
       -
                   When you want to use this, make sure ${configFile} doesn't exist.

     

       72
       72
       -
                   It will be created for you.

     

       73
       73
       -
       

     

       74
       74
       -
                   Currently it is also necessary to explicitly specify networking.wireless.interfaces.

     

       78
       78
       +
                   When using a declarative network specification you cannot persist any

     

       79
       79
       +
                   settings via wpa_gui or wpa_cli.

     

       75
       80
        
                 '';

     

       76
       81
        
               };

     

       77
       82
        
       

     
···

       85
       90
        
           };

     

       86
       91
        
         };

     

       87
       92
        
       

     

       88
       88
       -
       

     

       89
       89
       -
         ###### implementation

     

       90
       90
       -
       

     

       91
       91
       -
         config = mkIf cfg.enable {

     

       92
       92
       -
       

     

       93
       93
       -
           environment.systemPackages =  [ pkgs.wpa_supplicant ];

     

       93
       93
       +
         config = mkMerge [

     

       94
       94
       +
           (mkIf cfg.enable {

     

       95
       95
       +
             environment.systemPackages =  [ pkgs.wpa_supplicant ];

     

       94
       96
        
       

     

       95
       95
       -
           services.dbus.packages = [ pkgs.wpa_supplicant ];

     

       97
       97
       +
             services.dbus.packages = [ pkgs.wpa_supplicant ];

     

       96
       98
        
       

     

       97
       97
       -
           # FIXME: start a separate wpa_supplicant instance per interface.

     

       98
       98
       -
           jobs.wpa_supplicant =

     

       99
       99
       -
             { description = "WPA Supplicant";

     

       99
       99
       +
             # FIXME: start a separate wpa_supplicant instance per interface.

     

       100
       100
       +
             systemd.services.wpa_supplicant = let

     

       101
       101
       +
               ifaces = cfg.interfaces;

     

       102
       102
       +
             in {

     

       103
       103
       +
               description = "WPA Supplicant";

     

       100
       104
        
       

     

       101
       105
        
               wantedBy = [ "network.target" ];

     

       102
       106
        
       

     

       103
       107
        
               path = [ pkgs.wpa_supplicant ];

     

       104
       108
        
       

     

       105
       105
       -
               preStart = ''

     

       106
       106
       -
                 touch -a ${configFile}

     

       107
       107
       -
                 chmod 600 ${configFile}

     

       108
       108
       -
               '' + optionalString cfg.userControlled.enable ''

     

       109
       109
       -
                 if [ ! -s ${configFile} ]; then

     

       110
       110
       -
                   echo "ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=${cfg.userControlled.group}" >> ${configFile}

     

       111
       111
       -
                   echo "update_config=1" >> ${configFile}

     

       112
       112
       -
                 fi

     

       109
       109
       +
               script = ''

     

       110
       110
       +
                 ${if ifaces == [] then ''

     

       111
       111
       +
                   for i in $(cd /sys/class/net && echo *); do

     

       112
       112
       +
                     DEVTYPE=

     

       113
       113
       +
                     source /sys/class/net/$i/uevent

     

       114
       114
       +
                     if [ "$DEVTYPE" = "wlan" -o -e /sys/class/net/$i/wireless ]; then

     

       115
       115
       +
                       ifaces="$ifaces''${ifaces:+ -N} -i$i"

     

       116
       116
       +
                     fi

     

       117
       117
       +
                   done

     

       118
       118
       +
                 '' else ''

     

       119
       119
       +
                   ifaces="${concatStringsSep " -N " (map (i: "-i${i}") ifaces)}"

     

       120
       120
       +
                 ''}

     

       121
       121
       +
                 exec wpa_supplicant -s -u -D${cfg.driver} -c ${configFile} $ifaces

     

       113
       122
        
               '';

     

       114
       114
       -
       

     

       115
       115
       -
               script =

     

       116
       116
       -
                 ''

     

       117
       117
       -
                   ${if ifaces == [] then ''

     

       118
       118
       -
                     for i in $(cd /sys/class/net && echo *); do

     

       119
       119
       -
                       DEVTYPE=

     

       120
       120
       -
                       source /sys/class/net/$i/uevent

     

       121
       121
       -
                       if [ "$DEVTYPE" = "wlan" -o -e /sys/class/net/$i/wireless ]; then

     

       122
       122
       -
                         ifaces="$ifaces''${ifaces:+ -N} -i$i"

     

       123
       123
       -
                       fi

     

       124
       124
       -
                     done

     

       125
       125
       -
                   '' else ''

     

       126
       126
       -
                     ifaces="${concatStringsSep " -N " (map (i: "-i${i}") ifaces)}"

     

       127
       127
       -
                   ''}

     

       128
       128
       -
                   exec wpa_supplicant -s -u -D${cfg.driver} -c ${configFile} $ifaces

     

       129
       129
       -
                 '';

     

       130
       123
        
             };

     

       131
       124
        
       

     

       132
       132
       -
           powerManagement.resumeCommands =

     

       133
       133
       -
             ''

     

       125
       125
       +
             powerManagement.resumeCommands = ''

     

       134
       126
        
               ${config.systemd.package}/bin/systemctl try-restart wpa_supplicant

     

       135
       127
        
             '';

     

       136
       128
        
       

     

       137
       137
       -
           assertions = [{ assertion = !cfg.userControlled.enable || cfg.interfaces != [];

     

       138
       138
       -
                           message = "user controlled wpa_supplicant needs explicit networking.wireless.interfaces";}];

     

       139
       139
       -
       

     

       140
       140
       -
           # Restart wpa_supplicant when a wlan device appears or disappears.

     

       141
       141
       -
           services.udev.extraRules =

     

       142
       142
       -
             ''

     

       129
       129
       +
             # Restart wpa_supplicant when a wlan device appears or disappears.

     

       130
       130
       +
             services.udev.extraRules = ''

     

       143
       131
        
               ACTION=="add|remove", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", RUN+="${config.systemd.package}/bin/systemctl try-restart wpa_supplicant.service"

     

       144
       132
        
             '';

     

       145
       145
       -
       

     

       146
       146
       -
         };

     

       147
       147
       -
       

     

       133
       133
       +
           })

     

       134
       134
       +
           {

     

       135
       135
       +
             meta.maintainers = with lib.maintainers; [ globin ];

     

       136
       136
       +
           }

     

       137
       137
       +
         ];

     

       148
       138
        
       }