From f2a212f1b6af773b37266a37dc67205ab2e48013 Mon Sep 17 00:00:00 2001
From: emily <ek@kyouma.net>
Date: Wed, 12 Jun 2024 20:25:41 +0200
Subject: [PATCH] Fix network and storage on emilia

---
 config/hosts/emilia/configuration.nix | 11 +++++------
 config/hosts/emilia/disko.nix         | 21 ++++++---------------
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/config/hosts/emilia/configuration.nix b/config/hosts/emilia/configuration.nix
index d6f52fd..2aeb3b7 100644
--- a/config/hosts/emilia/configuration.nix
+++ b/config/hosts/emilia/configuration.nix
@@ -18,13 +18,12 @@
 
   networking.hostName = "emilia";
   systemd.network.networks."98-eth-default" = {
-    matchConfig.Type = "ether";
-    matchConfig.Name = "enp0s31f6";
-    networkConfig = {
-      IPv6AcceptRA = false;
-    };
+    matchConfig.MACAddress = "04:d4:c4:39:73:f6";
     addresses = [
-      { Address = "95.217.83.107/26"; }
+      {
+        Address = "95.217.83.107/32";
+        Peer = "95.217.83.65/32";
+      }
       { Address = "2a01:4f9:4a:1f5f::1/64"; }
     ];
     routes = [
diff --git a/config/hosts/emilia/disko.nix b/config/hosts/emilia/disko.nix
index 1f0b4ad..7eb15c2 100644
--- a/config/hosts/emilia/disko.nix
+++ b/config/hosts/emilia/disko.nix
@@ -13,8 +13,9 @@
             type = "EF00";
             size = "512M";
             content = {
-              type = "mdraid";
-              name = "boot";
+              type = "filesystem";
+              format = "vfat";
+              mountpoint = "/boot";
             };
           };
           root = {
@@ -55,8 +56,9 @@
             type = "EF00";
             size = "512M";
             content = {
-              type = "mdraid";
-              name = "boot";
+              type = "filesystem";
+              format = "vfat";
+              mountpoint = null;
             };
           };
           root = {
@@ -65,16 +67,5 @@
         };
       };
     };
-    mdadm.boot = {
-      type = "mdadm";
-      level = 1;
-      metadata = "1.0";
-      content = {
-        type = "filesystem";
-        format = "vfat";
-        mountpoint = "/boot";
-        mountOptions = [ "umask=0077" "defaults" ];
-      };
-    };
   };
 }