Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c9b85da380d4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 985697bff703
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 27, 2019

  1. nixos/doc: Clarify wireless examples

    This commits makes it clearer to a novice reader how to configure several
    diferent types of SSID connections that were otherwise obscurely documented
    
    Resolves #66650
    craigem authored and worldofpeace committed Sep 27, 2019
    Copy the full SHA
    cce7486 View commit details
  2. Merge pull request #66652 from craigem/clarify_wireless_examples

    nixos/doc: Clarify wireless examples
    worldofpeace authored Sep 27, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    985697b View commit details
Showing with 21 additions and 4 deletions.
  1. +9 −2 nixos/doc/manual/configuration/wireless.xml
  2. +12 −2 nixos/modules/services/networking/wpa_supplicant.nix
11 changes: 9 additions & 2 deletions nixos/doc/manual/configuration/wireless.xml
Original file line number Diff line number Diff line change
@@ -19,10 +19,17 @@
NixOS lets you specify networks for wpa_supplicant declaratively:
<programlisting>
<xref linkend="opt-networking.wireless.networks"/> = {
echelon = {
echelon = { # SSID with no spaces or special characters
psk = "abcdefgh";
};
"free.wifi" = {};
"echelon's AP" = { # SSID with spaces and/or special characters
psk = "ijklmnop";
};
echelon = { # Hidden SSID
hidden = true;
psk = "qrstuvwx";
};
free.wifi = {}; # Public wireless network
};
</programlisting>
Be aware that keys will be written to the nix store in plaintext! When no
14 changes: 12 additions & 2 deletions nixos/modules/services/networking/wpa_supplicant.nix
Original file line number Diff line number Diff line change
@@ -103,6 +103,13 @@ in {
description = ''
Set this to <literal>true</literal> if the SSID of the network is hidden.
'';
example = literalExample ''
{ echelon = {
hidden = true;
psk = "abcdefgh";
};
}
'';
};

priority = mkOption {
@@ -146,10 +153,13 @@ in {
'';
default = {};
example = literalExample ''
{ echelon = {
{ echelon = { # SSID with no spaces or special characters
psk = "abcdefgh";
};
"free.wifi" = {};
"echelon's AP" = { # SSID with spaces and/or special characters
psk = "ijklmnop";
};
"free.wifi" = {}; # Public wireless network
}
'';
};