commit 3482f3e7f1fc9f0292bc0c7825f99898385a18f0 · kitten.sh/system

+3 -22

modules/router/default.nix

···

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

     

       1
       1
       +
       { lib, helpers, ... }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       let

     

       5
       5
       -
         cfg = config.modules.router;

     

       6
       6
       -
       in {

     

       3
       3
       +
       with lib; {

     

       7
       4
        
         options.modules.router = {

     

       8
       5
        
           enable = mkOption {

     

       9
       6
        
             default = false;

     
···

       11
       8
        
             description = "Whether to enable Router options.";

     

       12
       9
        
             type = types.bool;

     

       13
       10
        
           };

     

       14
       14
       -
       

     

       15
       15
       -
           interfaces = {

     

       16
       16
       -
             external = mkOption {

     

       17
       17
       -
               default = "extern0";

     

       18
       18
       -
               type = types.str;

     

       19
       19
       -
             };

     

       20
       20
       -
             internal = mkOption {

     

       21
       21
       -
               default = "intern0";

     

       22
       22
       -
               type = types.str;

     

       23
       23
       -
             };

     

       24
       24
       -
           };

     

       25
       11
        
         };

     

       26
       12
        
       

     

       27
       13
        
         config.modules.router = {

     
···

       29
       15
        
         };

     

       30
       16
        
       } // helpers.linuxAttrs {

     

       31
       17
        
         imports = [

     

       18
       18
       +
           ./network.nix

     

       32
       19
        
           ./timeserver.nix

     

       33
       20
        
           ./dnsOverTLS.nix

     

       34
       21
        
           ./dnsmasq.nix

     
···

       37
       24
        
           ./mdns.nix

     

       38
       25
        
           ./kernel.nix

     

       39
       26
        
         ];

     

       40
       40
       -
       

     

       41
       41
       -
         config = mkIf cfg.enable {

     

       42
       42
       -
           networking.firewall.trustedInterfaces = [

     

       43
       43
       -
             cfg.interfaces.internal

     

       44
       44
       -
           ];

     

       45
       45
       -
         };

     

       46
       27
        
       }

+2 -2

modules/router/mdns.nix

···

       15
       15
        
         config = mkIf cfg.mdns.enable {

     

       16
       16
        
           services.avahi = {

     

       17
       17
        
             enable = true;

     

       18
       18
       -
             allowInterfaces = [ cfg.interfaces.internal ];

     

       19
       19
       -
             denyInterfaces = [ cfg.interfaces.external ];

     

       18
       18
       +
             allowInterfaces = [ cfg.interfaces.internal.name ];

     

       19
       19
       +
             denyInterfaces = [ cfg.interfaces.external.name ];

     

       20
       20
        
           };

     

       21
       21
        
         };

     

       22
       22
        
       }

+84

modules/router/network.nix

···

       1
       1
       +
       { lib, config, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       let

     

       5
       5
       +
         cfg = config.modules.router;

     

       6
       6
       +
       

     

       7
       7
       +
         interfaceType = types.submodule {

     

       8
       8
       +
           options = {

     

       9
       9
       +
             name = mkOption {

     

       10
       10
       +
               type = types.str;

     

       11
       11
       +
               example = "eth0";

     

       12
       12
       +
             };

     

       13
       13
       +
             macAddress = mkOption {

     

       14
       14
       +
               type = types.str;

     

       15
       15
       +
               example = "00:00:00:00:00:00";

     

       16
       16
       +
             };

     

       17
       17
       +
           };

     

       18
       18
       +
         };

     

       19
       19
       +
       

     

       20
       20
       +
         extern0 = cfg.interfaces.external.name;

     

       21
       21
       +
         extern0MAC = cfg.interfaces.external.macAddress;

     

       22
       22
       +
         intern0 = cfg.interfaces.internal.name;

     

       23
       23
       +
         intern0MAC = cfg.interfaces.internal.macAddress;

     

       24
       24
       +
       in {

     

       25
       25
       +
         options.modules.router = {

     

       26
       26
       +
           interfaces = {

     

       27
       27
       +
             external = interfaceType;

     

       28
       28
       +
             internal = interfaceType;

     

       29
       29
       +
           };

     

       30
       30
       +
         };

     

       31
       31
       +
       

     

       32
       32
       +
         config = mkIf cfg.enable {

     

       33
       33
       +
           services.irqbalance.enable = true;

     

       34
       34
       +
       

     

       35
       35
       +
           networking.firewall.trustedInterfaces = [ "lo" intern0 ];

     

       36
       36
       +
       

     

       37
       37
       +
           systemd.network = {

     

       38
       38
       +
             enable = true;

     

       39
       39
       +
       

     

       40
       40
       +
             links."10-${extern0}" = {

     

       41
       41
       +
               matchConfig.PermanentMACAddress = extern0MAC;

     

       42
       42
       +
               linkConfig = {

     

       43
       43
       +
                 Description = "External Network Interface";

     

       44
       44
       +
                 Name = extern0;

     

       45
       45
       +
                 # MACAddress = "64:20:9f:16:70:a6";

     

       46
       46
       +
                 MTUBytes = "1500";

     

       47
       47
       +
               };

     

       48
       48
       +
             };

     

       49
       49
       +
       

     

       50
       50
       +
             links."11-${intern0}" = {

     

       51
       51
       +
               matchConfig.PermanentMACAddress = intern0MAC;

     

       52
       52
       +
               linkConfig = {

     

       53
       53
       +
                 Description = "Internal Network Interface";

     

       54
       54
       +
                 Name = intern0;

     

       55
       55
       +
                 MTUBytes = "1500";

     

       56
       56
       +
               };

     

       57
       57
       +
             };

     

       58
       58
       +
       

     

       59
       59
       +
             networks."10-${extern0}" = {

     

       60
       60
       +
               name = extern0;

     

       61
       61
       +
               networkConfig = {

     

       62
       62
       +
                 DHCP = "ipv4";

     

       63
       63
       +
                 DNS = if cfg.dnsmasq.enable then "127.0.0.1" else "1.1.1.1";

     

       64
       64
       +
                 IPForward = true;

     

       65
       65
       +
               };

     

       66
       66
       +
               dhcpV4Config = {

     

       67
       67
       +
                 UseDNS = false;

     

       68
       68
       +
                 UseDomains = false;

     

       69
       69
       +
                 UseNTP = !cfg.timeserver.enable;

     

       70
       70
       +
               };

     

       71
       71
       +
             };

     

       72
       72
       +
       

     

       73
       73
       +
             networks."11-${intern0}" = {

     

       74
       74
       +
               name = intern0;

     

       75
       75
       +
               networkConfig = {

     

       76
       76
       +
                 Address = "10.0.0.1/24";

     

       77
       77
       +
                 DHCPServer = false;

     

       78
       78
       +
                 IPForward = true;

     

       79
       79
       +
                 ConfigureWithoutCarrier = true;

     

       80
       80
       +
               };

     

       81
       81
       +
             };

     

       82
       82
       +
           };

     

       83
       83
       +
         };

     

       84
       84
       +
       }

+6 -3

modules/router/nftables.nix

···

       4
       4
        
       let

     

       5
       5
        
         cfg = config.modules.router;

     

       6
       6
        
       

     

       7
       7
       +
         intern0 = cfg.interfaces.internal.name;

     

       8
       8
       +
         extern0 = cfg.interfaces.external.name;

     

       9
       9
       +
       

     

       7
       10
        
         trustedInterfaces =

     

       8
       11
        
           strings.concatMapStringsSep ", " strings.escapeNixIdentifier config.networking.firewall.trustedInterfaces;

     

       9
       12
        
       

     
···

       13
       16
        
       

     

       14
       17
        
         blockForwardRules =

     

       15
       18
        
           string.concatMapStringsSep "\n"

     

       16
       16
       -
             (builtins.map (mac: "  iifname ${cfg.interfaces.internal} oifname != ${cfg.interfaces.internal} ether saddr = ${mac} drop"));

     

       19
       19
       +
             (builtins.map (mac: "  iifname ${intern0} oifname != ${intern0} ether saddr = ${mac} drop"));

     

       17
       20
        
       in {

     

       18
       21
        
         options.modules.router = {

     

       19
       22
        
           nftables = {

     
···

       121
       124
        
               family = "netdev";

     

       122
       125
        
               content = ''

     

       123
       126
        
                 chain lan {

     

       124
       124
       -
                   type filter hook ingress device ${cfg.interfaces.internal} priority -150; policy accept;

     

       127
       127
       +
                   type filter hook ingress device ${intern0} priority -150; policy accept;

     

       125
       128
        
                   jump tags

     

       126
       129
        
                 }

     

       127
       130
        
       

     

       128
       131
        
                 chain wan {

     

       129
       129
       -
                   type filter hook ingress device ${cfg.interfaces.external} priority -149; policy accept;

     

       132
       132
       +
                   type filter hook ingress device ${extern0} priority -149; policy accept;

     

       130
       133
        
                   jump tags

     

       131
       134
        
                 }

     

       132
       135

+6 -3

modules/router/timeserver.nix

···

       4
       4
        
       let

     

       5
       5
        
         cfg = config.modules.router;

     

       6
       6
        
       

     

       7
       7
       +
         listenInterfaces =

     

       8
       8
       +
           strings.concatMapStringsSep "\n"

     

       9
       9
       +
             (builtins.map (ifname: "interface listen ${ifname}") config.networking.firewall.trustedInterfaces);

     

       10
       10
       +
       

     

       7
       11
        
         ntpExtraConfig = ''

     

       8
       8
       -
           interface listen lo

     

       9
       9
       -
           interface listen ${cfg.interfaces.internal}

     

       10
       10
       -
           interface ignore ${cfg.interfaces.external}

     

       12
       12
       +
           ${listenInterfaces}

     

       13
       13
       +
           interface ignore ${cfg.interfaces.external.name}

     

       11
       14
        
         '';

     

       12
       15
        
       in {

     

       13
       16
        
         options.modules.router = {

+2 -2

modules/router/upnp.nix

···

       19
       19
        
             enable = true;

     

       20
       20
        
             upnp = true;

     

       21
       21
        
             natpmp = true;

     

       22
       22
       -
             internalIPs = [ cfg.interfaces.internal ];

     

       23
       23
       -
             externalInterface = cfg.interfaces.external;

     

       22
       22
       +
             internalIPs = [ cfg.interfaces.internal.name ];

     

       23
       23
       +
             externalInterface = cfg.interfaces.external.name;

     

       24
       24
        
             appendConfig = ''

     

       25
       25
        
               secure_mode=yes

     

       26
       26
        
               notify_interval=60