commit 017dc2076230ea4af9a44a3302f68a71f07e6175 · dunkirk.sh/dots

+1 -1

nixos/modules/apps/default.nix

···

       3
        
         imports = [

     

       4
        
           ./tuigreet.nix

     

       5
        
         ];

     

       6
       -
       }

···

       3
        
         imports = [

     

       4
        
           ./tuigreet.nix

     

       5
        
         ];

     

       6
       +
       }

+77 -21

nixos/modules/network/wifi.nix

···

       1
       -
       { lib, config, pkgs, ... }:

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       2
        
       let

     

       3
        
         cfg = config.modules.network.wifi;

     

       4
       -
         mkProfile = name: p:

     

       0
        
       
     

       5
        
           let

     

       6
        
             base = {

     

       7
       -
               connection = { id = name; type = "wifi"; };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       8
        
               ipv4.method = "auto";

     

       9
       -
               ipv6 = { addr-gen-mode = "stable-privacy"; method = "auto"; };

     

       10
       -
               wifi = { mode = "infrastructure"; ssid = name; };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       11
        
             };

     

       12
        
             sec =

     

       13
       -
               if (p ? pskVar && p.pskVar != null) then { wifi-security = { key-mgmt = "wpa-psk"; psk = "$${" + p.pskVar + "}"; }; }

     

       14
       -
               else if (p ? psk && p.psk != null) then { wifi-security = { key-mgmt = "wpa-psk"; psk = p.psk; }; }

     

       15
       -
               else if (p ? pskFile && p.pskFile != null) then { wifi-security = { key-mgmt = "wpa-psk"; psk = "$(" + pkgs.coreutils + "/bin/cat " + p.pskFile + ")"; }; }

     

       16
       -
               else {};

     

       17
       -
           in base // sec;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       18
        
       in

     

       19
        
       {

     

       20
        
         options.modules.network.wifi = {

     

       21
        
           enable = lib.mkEnableOption "Enable NetworkManager with simplified Wi-Fi profiles";

     

       22
       -
           hostName = lib.mkOption { type = lib.types.str; default = config.networking.hostName or ""; };

     

       23
       -
           nameservers = lib.mkOption { type = lib.types.listOf lib.types.str; default = []; };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       24
        
           envFile = lib.mkOption {

     

       25
        
             type = lib.types.nullOr lib.types.path;

     

       26
        
             default = null;

     
···

       28
        
           };

     

       29
        
       

     

       30
        
           profiles = lib.mkOption {

     

       31
       -
             type = lib.types.attrsOf (lib.types.submodule ({ name, ... }: {

     

       32
       -
               options = {

     

       33
       -
                 pskVar = lib.mkOption { type = lib.types.nullOr lib.types.str; default = null; description = "Variable name in envFile providing PSK"; };

     

       34
       -
                 psk = lib.mkOption { type = lib.types.nullOr lib.types.str; default = null; };

     

       35
       -
                 pskFile = lib.mkOption { type = lib.types.nullOr lib.types.path; default = null; };

     

       36
       -
               };

     

       37
       -
             }));

     

       38
       -
             default = {};

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

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

     

       40
        
           };

     

       41
        
         };

     
···

       43
        
         config = lib.mkIf cfg.enable {

     

       44
        
           networking = {

     

       45
        
             hostName = lib.mkIf (cfg.hostName != "") cfg.hostName;

     

       46
       -
             nameservers = lib.mkIf (cfg.nameservers != []) cfg.nameservers;

     

       47
        
             useDHCP = false;

     

       48
        
             dhcpcd.enable = false;

     

       49
        
             networkmanager = {

···

       1
       +
       {

     

       2
       +
         lib,

     

       3
       +
         config,

     

       4
       +
         pkgs,

     

       5
       +
         ...

     

       6
       +
       }:

     

       7
        
       let

     

       8
        
         cfg = config.modules.network.wifi;

     

       9
       +
         mkProfile =

     

       10
       +
           name: p:

     

       11
        
           let

     

       12
        
             base = {

     

       13
       +
               connection = {

     

       14
       +
                 id = name;

     

       15
       +
                 type = "wifi";

     

       16
       +
               };

     

       17
        
               ipv4.method = "auto";

     

       18
       +
               ipv6 = {

     

       19
       +
                 addr-gen-mode = "stable-privacy";

     

       20
       +
                 method = "auto";

     

       21
       +
               };

     

       22
       +
               wifi = {

     

       23
       +
                 mode = "infrastructure";

     

       24
       +
                 ssid = name;

     

       25
       +
               };

     

       26
        
             };

     

       27
        
             sec =

     

       28
       +
               if (p ? pskVar && p.pskVar != null) then

     

       29
       +
                 {

     

       30
       +
                   wifi-security = {

     

       31
       +
                     key-mgmt = "wpa-psk";

     

       32
       +
                     psk = "$${" + p.pskVar + "}";

     

       33
       +
                   };

     

       34
       +
                 }

     

       35
       +
               else if (p ? psk && p.psk != null) then

     

       36
       +
                 {

     

       37
       +
                   wifi-security = {

     

       38
       +
                     key-mgmt = "wpa-psk";

     

       39
       +
                     psk = p.psk;

     

       40
       +
                   };

     

       41
       +
                 }

     

       42
       +
               else if (p ? pskFile && p.pskFile != null) then

     

       43
       +
                 {

     

       44
       +
                   wifi-security = {

     

       45
       +
                     key-mgmt = "wpa-psk";

     

       46
       +
                     psk = "$(" + pkgs.coreutils + "/bin/cat " + p.pskFile + ")";

     

       47
       +
                   };

     

       48
       +
                 }

     

       49
       +
               else

     

       50
       +
                 { };

     

       51
       +
           in

     

       52
       +
           base // sec;

     

       53
        
       in

     

       54
        
       {

     

       55
        
         options.modules.network.wifi = {

     

       56
        
           enable = lib.mkEnableOption "Enable NetworkManager with simplified Wi-Fi profiles";

     

       57
       +
           hostName = lib.mkOption {

     

       58
       +
             type = lib.types.str;

     

       59
       +
             default = config.networking.hostName or "";

     

       60
       +
           };

     

       61
       +
           nameservers = lib.mkOption {

     

       62
       +
             type = lib.types.listOf lib.types.str;

     

       63
       +
             default = [ ];

     

       64
       +
           };

     

       65
        
           envFile = lib.mkOption {

     

       66
        
             type = lib.types.nullOr lib.types.path;

     

       67
        
             default = null;

     
···

       69
        
           };

     

       70
        
       

     

       71
        
           profiles = lib.mkOption {

     

       72
       +
             type = lib.types.attrsOf (

     

       73
       +
               lib.types.submodule (

     

       74
       +
                 { name, ... }:

     

       75
       +
                 {

     

       76
       +
                   options = {

     

       77
       +
                     pskVar = lib.mkOption {

     

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

     

       79
       +
                       default = null;

     

       80
       +
                       description = "Variable name in envFile providing PSK";

     

       81
       +
                     };

     

       82
       +
                     psk = lib.mkOption {

     

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

     

       84
       +
                       default = null;

     

       85
       +
                     };

     

       86
       +
                     pskFile = lib.mkOption {

     

       87
       +
                       type = lib.types.nullOr lib.types.path;

     

       88
       +
                       default = null;

     

       89
       +
                     };

     

       90
       +
                   };

     

       91
       +
                 }

     

       92
       +
               )

     

       93
       +
             );

     

       94
       +
             default = { };

     

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

     

       96
        
           };

     

       97
        
         };

     
···

       99
        
         config = lib.mkIf cfg.enable {

     

       100
        
           networking = {

     

       101
        
             hostName = lib.mkIf (cfg.hostName != "") cfg.hostName;

     

       102
       +
             nameservers = lib.mkIf (cfg.nameservers != [ ]) cfg.nameservers;

     

       103
        
             useDHCP = false;

     

       104
        
             dhcpcd.enable = false;

     

       105
        
             networkmanager = {