commit fa28055cff9079a526b99dcb22890cc1b2f0a682 · dunkirk.sh/dots

machines/moonlark/default.nix

···

       312
       312
        
               "QargoCoffee-Guest".psk = "Lavazza@7";

     

       313
       313
        
               "Fulton".psk = "9064405930";

     

       314
       314
        
               "TP-LINK_ECF0".psk = "ad1066AD!";

     

       315
       315
       +
               "eduroam" = {

     

       316
       316
       +
                 eduroam = true;

     

       317
       317
       +
                 identity = "kieranklukas@cedarville.edu";

     

       318
       318
       +
                 pskVar = "psk_cedarville";

     

       319
       319
       +
               };

     

       315
       320
        
             };

     

       316
       321
        
           };

     

       317
       322
        
         };

+50 -2

modules/nixos/system/wifi.nix

···

       3
       3
        
       # This module provides a simpler way to declare wifi profiles with network manager.

     

       4
       4
        
       # - you can pass the PSK via environment variable, direct value, or file.

     

       5
       5
        
       # - profiles are defined in `atelier.network.wifi.profiles`.

     

       6
       6
       +
       # - eduroam networks are supported with the `eduroam = true` flag.

     

       6
       7
        
       #

     

       7
       8
        
       # Example usage:

     

       8
       9
        
       #   atelier.network.wifi = {

     

       9
       10
        
       #     enable = true;

     

       10
       11
        
       #     profiles = {

     

       11
       12
        
       #       "MySSID" = { psk = "supersecret"; };

     

       13
       13
       +
       #       "eduroam" = {

     

       14
       14
       +
       #         eduroam = true;

     

       15
       15
       +
       #         identity = "user@university.edu";

     

       16
       16
       +
       #         psk = "password";

     

       17
       17
       +
       #       };

     

       12
       18
        
       #     };

     

       13
       19
        
       #   };

     

       14
       20
        
       

     
···

       26
       32
        
             pskVar ? null,

     

       27
       33
        
             psk ? null,

     

       28
       34
        
             pskFile ? null,

     

       35
       35
       +
             eduroam ? false,

     

       36
       36
       +
             identity ? null,

     

       29
       37
        
           }:

     

       30
       38
        
           let

     

       31
       39
        
             base = {

     
···

       44
       52
        
               };

     

       45
       53
        
             };

     

       46
       54
        
             sec =

     

       47
       47
       -
               if pskVar != null then

     

       55
       55
       +
               if eduroam then

     

       56
       56
       +
                 if pskVar != null then

     

       57
       57
       +
                   {

     

       58
       58
       +
                     wifi-security = {

     

       59
       59
       +
                       key-mgmt = "wpa-eap";

     

       60
       60
       +
                       password = "$" + pskVar;

     

       61
       61
       +
                       identity = identity;

     

       62
       62
       +
                       phase2-auth = "mschapv2";

     

       63
       63
       +
                     };

     

       64
       64
       +
                   }

     

       65
       65
       +
                 else if psk != null then

     

       66
       66
       +
                   {

     

       67
       67
       +
                     wifi-security = {

     

       68
       68
       +
                       key-mgmt = "wpa-eap";

     

       69
       69
       +
                       password = psk;

     

       70
       70
       +
                       identity = identity;

     

       71
       71
       +
                       phase2-auth = "mschapv2";

     

       72
       72
       +
                     };

     

       73
       73
       +
                   }

     

       74
       74
       +
                 else if pskFile != null then

     

       75
       75
       +
                   {

     

       76
       76
       +
                     wifi-security = {

     

       77
       77
       +
                       key-mgmt = "wpa-eap";

     

       78
       78
       +
                       password = "$(" + pkgs.coreutils + "/bin/cat " + pskFile + ")";

     

       79
       79
       +
                       identity = identity;

     

       80
       80
       +
                       phase2-auth = "mschapv2";

     

       81
       81
       +
                     };

     

       82
       82
       +
                   }

     

       83
       83
       +
                 else

     

       84
       84
       +
                   { }

     

       85
       85
       +
               else if pskVar != null then

     

       48
       86
        
                 {

     

       49
       87
        
                   wifi-security = {

     

       50
       88
        
                     key-mgmt = "wpa-psk";

     
···

       106
       144
        
                       type = lib.types.nullOr lib.types.path;

     

       107
       145
        
                       default = null;

     

       108
       146
        
                     };

     

       147
       147
       +
                     eduroam = lib.mkOption {

     

       148
       148
       +
                       type = lib.types.bool;

     

       149
       149
       +
                       default = false;

     

       150
       150
       +
                       description = "Enable eduroam configuration";

     

       151
       151
       +
                     };

     

       152
       152
       +
                     identity = lib.mkOption {

     

       153
       153
       +
                       type = lib.types.nullOr lib.types.str;

     

       154
       154
       +
                       default = null;

     

       155
       155
       +
                       description = "Identity for eduroam authentication";

     

       156
       156
       +
                     };

     

       109
       157
        
                   };

     

       110
       158
        
                 }

     

       111
       159
        
               )

     

       112
       160
        
             );

     

       113
       161
        
             default = { };

     

       114
       114
       -
             description = "Map of SSID -> { pskVar | psk | pskFile }.";

     

       162
       162
       +
             description = "Map of SSID -> { pskVar | psk | pskFile | eduroam config }.";

     

       115
       163
        
           };

     

       116
       164
        
         };

     

       117
       165

secrets/wifi.age

This is a binary file and will not be displayed.