Changes to nutmeg and flake.nix

config/host-config/nutboy3.nix

@@ -272,11 +272,19 @@ in {
           };
 
           interfaces.eno2 = {
-            ipv4.addresses = [{
-              address = "208.81.4.82";
-              prefixLength = 29;
-            }];
+            ipv4.addresses = [
+              {
+                address = "208.81.4.82";
+                prefixLength = 29;
+              }
+              {
+                address = "208.81.1.141";
+                prefixLength = 32;
+              }
+            ];
           };
+
+          firewall.enable = false;
         };
 
         services = {

config/host-config/spark.nix

@@ -1,21 +1,19 @@
 { config, lib, pkgs, ... }:
 
 {
-  config = {
-    fudo.slynk.enable = true;
+  fudo.slynk.enable = true;
 
-    networking = {
-      interfaces = {
-        extif0 = { useDHCP = true; };
-      };
-    };
-    
-    i18n.inputMethod = {
-      enabled = "fcitx5";
-      fcitx5.addons = with pkgs; [
-        fcitx5-chinese-addons
-        fcitx5-rime
-      ];
+  networking = {
+    interfaces = {
+      extif0 = { useDHCP = true; };
     };
   };
+
+  i18n.inputMethod = {
+    enabled = "fcitx5";
+    fcitx5.addons = with pkgs; [
+      fcitx5-chinese-addons
+      fcitx5-rime
+    ];
+  };
 }

config/hosts.nix

@@ -2,12 +2,12 @@
 
 with lib;
 let
-  syslib = pkgs.callPackage ../lib/hosts.nix {};
+  syslib = pkgs.callPackage ../lib/system.nix {};
 
 in {
   config.fudo.hosts = let
     build-seed = config.instance.build-seed;
-    base-config = syslib.base-host-config ./hosts;
+    base-config = syslib.hosts ./hosts;
   in mapAttrs (hostname: base-config:
     base-config // {
       backplane-password-file =

config/hosts/atom.nix

@@ -3,7 +3,7 @@
   enable-gui = false;
   rp = "niten";
   admin-email = "niten@fudo.org";
-  domain = "sea.fudo.org";
+  domain = "mobile.fudo.org";
   site = "mobile";
   profile = "laptop";
   arch = "x86_64-linux";

config/profile-config/desktop.nix

@@ -4,7 +4,5 @@ with lib;
 {
   imports = [ ./common-ui.nix ];
 
-  config = {
-    networking.networkmanager.enable = mkForce false;
-  };
+  networking.networkmanager.enable = mkForce false;
 }