julm: pumpkin: Xmodmap: use Control_R as alternative modMask

[julm/julm-nix.git] / hosts / aubergine / networking.nix

diff --git a/hosts/aubergine/networking.nix b/hosts/aubergine/networking.nix
index db3b990cd53342335cdd19de0eed8ba1fb2a42d1..51cde16cbb9d7c9f504979a33a05c27a224747e2 100644 (file)
--- a/hosts/aubergine/networking.nix
+++ b/hosts/aubergine/networking.nix
@@ -1,5 +1,4 @@
-{ lib, ... }:
-with lib;
+{ pkgs, lib, ... }:
 with (import networking/names-and-numbers.nix);
 {
   imports = [
@@ -9,6 +8,7 @@ with (import networking/names-and-numbers.nix);
     networking/lte.nix
     networking/nftables.nix
     ../../nixos/profiles/dnscrypt-proxy2.nix
+    ../../nixos/profiles/printing.nix
     ../../nixos/profiles/networking/ssh.nix
   ];
   install.substituteOnDestination = false;
@@ -16,7 +16,7 @@ with (import networking/names-and-numbers.nix);
   networking.useDHCP = false;
 
   boot.kernel.sysctl."net.ipv4.ip_forward" = 1;
-  networking.nftables.ruleset = mkAfter ''
+  networking.nftables.ruleset = lib.mkAfter ''
     table inet filter {
       chain forward-to-lan {
         #jump forward-connectivity
@@ -27,7 +27,8 @@ with (import networking/names-and-numbers.nix);
         counter accept
       }
       chain forward-from-net {
-        ct state { established, related } accept
+        ct state established accept
+        ct state related accept
         log level warn prefix "forward-from-net: " counter drop
       }
       chain forward {
@@ -40,7 +41,6 @@ with (import networking/names-and-numbers.nix);
   services.avahi = {
     enable = true;
     openFirewall = true;
-    nssmdns4 = true;
     publish = {
       enable = true;
       addresses = true;
@@ -49,6 +49,7 @@ with (import networking/names-and-numbers.nix);
       userServices = true;
       workstation = true;
     };
+    reflector = true;
   };
   # WARNING: settings.listen_addresses are not merged...
   # hence there all defined here.
@@ -68,4 +69,9 @@ with (import networking/names-and-numbers.nix);
   systemd.services.sshd.serviceConfig.LoadCredentialEncrypted = [
     "host.key:${ssh/host.key.cred}"
   ];
+
+  programs.wireshark = {
+    enable = true;
+    package = pkgs.wireshark-cli;
+  };
 }