refactor pkgs/lib -> lib, kw.fw -> network.firewall, ...

depot/hosts/athame/nixos.nix

@@ -92,7 +92,7 @@ with lib;
 
   # Firewall
 
-  kw.fw = {
+  network.firewall = {
     public.interfaces = singleton "enp1s0";
     private.interfaces = singleton "yggdrasil";
   };

depot/hosts/beltane/nixos.nix

@@ -108,7 +108,7 @@ with lib;
 
   # Firewall
 
-  kw.fw = {
+  network.firewall = {
     private.interfaces = singleton "yggdrasil";
     public.interfaces = singleton "eno1";
   };

depot/hosts/ostara/nixos.nix

@@ -55,7 +55,7 @@ with lib;
 
   # Firewall
 
-  kw.fw = {
+  network.firewall = {
     public = {
       interfaces = singleton "enp1s0";
       tcp.ports = [ 9981 9982 ];

depot/hosts/samhain/nixos.nix

@@ -135,7 +135,7 @@ in {
 
   # Firewall
 
-  kw.fw = {
+  network.firewall = {
     public.interfaces = singleton "br";
     private = {
       interfaces = singleton "yggdrasil";

depot/hosts/yule/nixos.nix

@@ -81,7 +81,7 @@ with lib;
 
   # Firewall
 
-  kw.fw = {
+  network.firewall = {
     public.interfaces = [ "enp1s0" "wlp2s0" ];
     private.interfaces = singleton "yggdrasil";
   };

depot/modules/nixos/firewall.nix

@@ -2,10 +2,10 @@
 
 with lib;
 
-let cfg = config.kw.fw;
+let cfg = config.network.firewall;
 in
 {
-  options.kw.fw = {
+  options.network.firewall = {
     public.tcp.ports = mkOption {
       type = types.listOf types.port;
       default = [ ];

depot/modules/nixos/nftables.nix

@@ -2,7 +2,7 @@
 
 let
   fwcfg = config.networking.firewall;
-  cfg = config.kw.nftables;
+  cfg = config.network.nftables;
 
   doDocker = config.virtualisation.docker.enable && cfg.generateDockerRules;
 
@@ -82,7 +82,7 @@ let
 
 in {
   options = with lib; {
-    kw.nftables = {
+    network.nftables = {
       enable = mkEnableOption "nftables firewall";
 
       extraConfig = mkOption {

depot/profiles/base/net.nix

@@ -1,5 +1,5 @@
 { config, lib, ... }:
 
 {
-  kw.nftables.enable = lib.mkDefault true;
+  network.nftables.enable = lib.mkDefault true;
 }

depot/profiles/base/ssh.nix

@@ -3,7 +3,7 @@
 with lib;
 
 {
-  kw.fw = {
+  network.firewall = {
     public = {
       tcp.ports = singleton 62954;
       udp.ranges = [{

depot/profiles/gui/mpd.nix

@@ -3,7 +3,7 @@
 with lib;
 
 {
-  kw.fw = {
+  network.firewall = {
     public.tcp.ports = [ 6600 32101 ];
     private.tcp.ports = [ 6600 32101 ];
   };

depot/services/asterisk/default.nix

@@ -5,15 +5,15 @@ with lib;
 
 {
 /*
-  kw.fw.public.tcp.ports = [ 5160 5060 ];
-  kw.fw.public.udp.ports = [ 5160 5060 ];
+  network.firewall.public.tcp.ports = [ 5160 5060 ];
+  network.firewall.public.udp.ports = [ 5160 5060 ];
 
-  kw.fw.public.tcp.ranges = [{
+  network.firewall.public.tcp.ranges = [{
     from = 10000;
     to = 20000;
   }];
 
-  kw.fw.public.udp.ranges = [{
+  network.firewall.public.udp.ranges = [{
     from = 10000;
     to = 20000;
   }];

depot/services/jellyfin/default.nix

@@ -15,7 +15,7 @@
     };
   };
 
-  kw.fw = {
+  network.firewall = {
     public.tcp.ranges = [{
       from = 32768;
       to = 60999;

depot/services/kattv-ingest/default.nix

@@ -110,7 +110,7 @@ in {
       }
   '';
 
-  kw.fw = {
+  network.firewall = {
     private.tcp.ports = singleton 1935;
     public.tcp.ports = [ 4953 1935 ];
   };

depot/services/loki/default.nix

@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 {
-  #kw.fw.private.tcp.ports = [ 3100 ];
+  #network.firewall.private.tcp.ports = [ 3100 ];
   services.loki = {
     enable = false;
     configuration = {

depot/services/murmur/default.nix

@@ -3,7 +3,7 @@
 with lib;
 
 {
-  kw.fw = {
+  network.firewall = {
     public = {
       tcp.ports = singleton 64738;
       udp.ports = singleton 64738;

depot/services/netdata/default.nix

@@ -1,7 +1,7 @@
 { config, kw, ... }:
 
 {
-  kw.fw.private.tcp.ports = [ 19999 ];
+  network.firewall.private.tcp.ports = [ 19999 ];
 
   services.netdata = { enable = true; };
 

depot/services/nfs/default.nix

@@ -1,7 +1,7 @@
 { config, lib, kw, ... }:
 
 {
-  kw.fw = {
+  network.firewall = {
     private.tcp.ports = [ 111 2049 ];
     public.tcp.ports = [ 111 2049 ];
   };

depot/services/nginx/default.nix

@@ -12,7 +12,7 @@ with lib;
     '';
   };
 
-  kw.fw = {
+  network.firewall = {
     public.tcp.ports = [ 443 80 ];
     private.tcp.ports = [ 443 80 ];
   };

depot/services/node-exporter/default.nix

@@ -1,7 +1,7 @@
 { config, ... }:
 
 {
-  kw.fw.private.tcp.ports = [ 9002 ];
+  network.firewall.private.tcp.ports = [ 9002 ];
 
   services.prometheus = {
     exporters = {

depot/services/syncplay/default.nix

@@ -21,7 +21,7 @@ with lib;
     };
   };
 
-  kw.fw.public.tcp.ports = singleton 8999;
+  network.firewall.public.tcp.ports = singleton 8999;
 
   services.nginx.virtualHosts."sync.${config.network.dns.domain}" = {
     enableACME = true;

depot/services/taskserver/default.nix

@@ -3,7 +3,7 @@
 with lib;
 
 {
-  kw.fw.public.tcp.ports = singleton 53589;
+  network.firewall.public.tcp.ports = singleton 53589;
 
   services.taskserver = {
     enable = true;

depot/services/tvheadend/default.nix

@@ -5,7 +5,7 @@
   services.tvheadend.enable = true;
   systemd.services.tvheadend.enable = lib.mkForce false;
 
-  kw.fw.public = {
+  network.firewall.public = {
     tcp.ports = [ 9981 9982 ];
   };
 

depot/services/xmpp/default.nix

@@ -3,7 +3,7 @@
 with lib;
 
 {
-  kw.fw.public.tcp.ports = [ 5000 5222 5223 5269 580 5281 5347 5582 ];
+  network.firewall.public.tcp.ports = [ 5000 5222 5223 5269 580 5281 5347 5582 ];
 
   services.postgresql = {
     ensureDatabases = [ "prosody" ];