chore: merge remote-tracking branch 'refs/remotes/origin/master'

hosts/dandelion/default.nix

@@ -16,8 +16,6 @@
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOLdcB5JFWx6OK2BAr8J0wPHNhr2VP2/Ci6fv3a+DPfo liv@violet" # allow violet to log in over ssh to do back ups
   ];
 
-  networking.hostName = "dandelion";
-
   liv.server.enable = true;
 
   nixpkgs.config.permittedInsecurePackages = [
@@ -27,8 +25,34 @@
 
   time.timeZone = "Europe/Amsterdam";
 
+  networking = {
+    hostName = "dandelion";
+    firewall = {
+      allowedTCPPorts = [
+        5201
+      ];
+      allowedUDPPorts = [
+        5201
+      ];
+      interfaces."ens4s1".allowedTCPPorts = [
+        # allow everything for local link
+        {
+          from = 1;
+          to = 65354;
+        }
+      ];
+      interfaces."ens4s1".allowedUDPPorts = [
+        # allow everything for local link
+        {
+          from = 1;
+          to = 65354;
+        }
+      ];
+    };
+  };
+
   systemd.network.networks."99-local" = {
-    matchConfig.name = "ens3s1";
+    matchConfig.name = "ens4s1";
     address = [
       "192.168.1.100/24"
     ];
@@ -60,16 +84,22 @@
     trim.enable = true;
   };
 
-  boot.zfs.extraPools = [ "spinners" ];
+  boot.zfs.extraPools = [
+    "spinners"
+  ];
 
-  fileSystems = {
-    "/spinners/rootvol" = {
-      device = "terrabite/rootvol";
-      fsType = "zfs";
-    };
-    "/spinners/ahwx" = {
-      device = "terrabite/ahwx";
-      fsType = "zfs";
-    };
-  };
+  # fileSystems = {
+  #   "/spinners/rootvol" = {
+  #     device = "spinners/rootvol";
+  #     fsType = "zfs";
+  #   };
+  #   "/spinners/ahwx" = {
+  #     device = "spinners/ahwx";
+  #     fsType = "zfs";
+  #   };
+  #   "/spinners/violet" = {
+  #     device = "spinners/violet";
+  #     fsType = "zfs";
+  #   };
+  # };
 }

hosts/sakura/default.nix

@@ -12,6 +12,7 @@
     ./../../modules/core/virtualization.nix
     ./../../modules/services/tailscale.nix
     ./../../modules/services/mpd.nix
+    ./../../modules/services/syncthing.nix
     ./../../modules/services/smart-monitoring.nix
     inputs.nixos-hardware.nixosModules.framework-13-7040-amd
   ];
@@ -46,7 +47,10 @@
   # Disable light sensors and accelerometers as they are not used and consume extra battery
   hardware.sensor.iio.enable = lib.mkForce false;
 
-  networking.hostName = "sakura";
+  networking = {
+    hostName = "sakura";
+    networkmanager.ethernet.macAddress = "13:37:13:37:13:37";
+  };
 
   powerManagement = {
     enable = true;

hosts/yoshino/default.nix

@@ -12,6 +12,7 @@
     # ./../../modules/home/nfs.nix
     ./../../modules/core/virtualization.nix
     ./../../modules/services/tailscale.nix
+    ./../../modules/services/mpd.nix
   ];
 
   powerManagement = {
@@ -20,6 +21,24 @@
     cpuFreqGovernor = lib.mkDefault "performance";
   };
 
+  networking = {
+    hostName = "yoshino";
+    networkmanager.enable = true;
+  };
+
+  systemd.network.networks."99-local" = {
+    matchConfig.name = "enp68s0";
+    address = [
+      "192.168.1.100/24"
+    ];
+    routes = [
+      {
+        Gateway = "172.16.10.1";
+        GatewayOnLink = false;
+      }
+    ];
+  };
+
   liv = {
     desktop.enable = true;
     creative.enable = true;
@@ -28,11 +47,6 @@
     gui.enable = true;
   };
 
-  networking = {
-    hostName = "yoshino";
-    networkmanager.enable = true;
-  };
-
   boot = {
     kernelParams = [ ];
     kernelModules = [ "acpi_call" ];