mod: fix fish_greeting

home/shell.nix

@@ -66,12 +66,12 @@
             "The gods themselves will be my meal. Your dear companions my dessert. Upon this world I'll feast, and death shall follow in my wake. All your hate, all your rage, you will render unto me." \
             "Boring, boring, boring" \
             "Would you be 'happier' had I a 'good reason'?" \
-            "A test of your reflexes!" \ 
+            "A test of your reflexes!" \
             "Yer a wizard, Wyatt" \
-            "Yer a lizard, Wyatt" \ 
-            "Po-Tay-To boil em mash em stick em in a stew" \ 
-            "Oh look it's the cutie patootie potato!" 
-            "What a charming young man" \ 
+            "Yer a lizard, Wyatt" \
+            "Po-Tay-To boil em mash em stick em in a stew" \
+            "Oh look it's the cutie patootie potato!" \
+            "What a charming young man" \
             "Wyatt, you are smart, kind, and resilient. I believe in you no matter what life throws at you! Kick this project's butt!! - Nico" \
             "Ganbatte!"
 

modules/machine/cloud/configuration.nix

@@ -151,10 +151,7 @@ in {
 
   # Core networking module (see ../../networking/core.nix)
   network = {
-    firewall = {
-      enable = true;
-      firewalld.enable = true;
-    };
+    firewall.enable = true;
     networkManager.enable = true;
   };
 

modules/networking/core.nix

@@ -8,12 +8,6 @@ in {
   options.network = {
     firewall = {
       enable = lib.mkEnableOption "system firewall";
-      firewalld.enable = lib.mkEnableOption "firewalld with its nftables backend";
-      nftables.extraConfig = lib.mkOption {
-        type = lib.types.lines;
-        default = "";
-        description = "Rules inside a separate inet nftables table alongside firewalld";
-      };
       tcpPorts = {
         ssh.enable = lib.mkEnableOption "SSH service port (22)";
         web.enable = lib.mkEnableOption "common web service ports (80, 443)";
@@ -48,21 +42,6 @@ in {
     };
   };
   config = {
-    assertions = [
-      {
-        assertion = cfg.firewall.nftables.extraConfig == "" || cfg.firewall.firewalld.enable;
-        message = "network.firewall.nftables.extraConfig requires network.firewall.firewalld.enable";
-      }
-    ];
-    services.firewalld.enable = cfg.firewall.firewalld.enable;
-    networking.nftables = lib.mkIf cfg.firewall.firewalld.enable {
-      enable = true;
-      flushRuleset = false;
-      tables."local-extra" = lib.mkIf (cfg.firewall.nftables.extraConfig != "") {
-        family = "inet";
-        content = cfg.firewall.nftables.extraConfig;
-      };
-    };
     networking.firewall = {
       enable = cfg.firewall.enable;
       allowedTCPPorts = lib.flatten [