commit 6b8ad8b581576d45996a17822e80e6be281dffd9 · pyrox.dev/nixpkgs

+10 -9
nixos/modules/tasks/network-interfaces-systemd.nix
···

       59
       59
        
           systemd.network =

     

       60
       60
        
             let

     

       61
       61
        
               domains = cfg.search ++ (optional (cfg.domain != null) cfg.domain);

     

       62
       62
       -
               genericNetwork = override: {

     

       63
       63
       -
                 DHCP = override (dhcpStr cfg.useDHCP);

     

       64
       64
       -
               } // optionalAttrs (cfg.defaultGateway != null) {

     

       65
       65
       -
                 gateway = override [ cfg.defaultGateway.address ];

     

       66
       66
       -
               } // optionalAttrs (cfg.defaultGateway6 != null) {

     

       67
       67
       -
                 gateway = override [ cfg.defaultGateway6.address ];

     

       68
       68
       -
               } // optionalAttrs (domains != [ ]) {

     

       69
       69
       -
                 domains = override domains;

     

       70
       70
       -
               };

     

       62
       62
       +
               genericNetwork = override:

     

       63
       63
       +
                 let gateway = optional (cfg.defaultGateway != null) cfg.defaultGateway.address

     

       64
       64
       +
                   ++ optional (cfg.defaultGateway6 != null) cfg.defaultGateway6.address;

     

       65
       65
       +
                 in {

     

       66
       66
       +
                   DHCP = override (dhcpStr cfg.useDHCP);

     

       67
       67
       +
                 } // optionalAttrs (gateway != [ ]) {

     

       68
       68
       +
                   gateway = override gateway;

     

       69
       69
       +
                 } // optionalAttrs (domains != [ ]) {

     

       70
       70
       +
                   domains = override domains;

     

       71
       71
       +
                 };

     

       71
       72
        
             in mkMerge [ {

     

       72
       73
        
               enable = true;

     

       73
       74
        
               networks."99-main" = genericNetwork mkDefault;