From 5db12a02f7cb213561e9d22dd296cc74dd9343e4 Mon Sep 17 00:00:00 2001
From: Constantin Gierczak--Galle <git.cst1@mailbox.org>
Date: Fri, 22 Nov 2024 15:46:51 +0100
Subject: [PATCH] fix(dns01): disk setup

---
 machines/dns01/_hardware-configuration.nix   | 35 ++++++++------------
 machines/dns01/beta.dgnum.eu.nix             |  4 +--
 machines/photo01/_hardware-configuration.nix |  1 -
 3 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/machines/dns01/_hardware-configuration.nix b/machines/dns01/_hardware-configuration.nix
index 749c0f8..8b0d66a 100644
--- a/machines/dns01/_hardware-configuration.nix
+++ b/machines/dns01/_hardware-configuration.nix
@@ -1,43 +1,34 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
 { lib, modulesPath, ... }:
 
 {
   imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
 
   boot = {
-    initrd = {
-      availableKernelModules = [
-        "ata_piix"
-        "uhci_hcd"
-        "virtio_pci"
-        "virtio_scsi"
-        "sd_mod"
-        "sr_mod"
-      ];
-      kernelModules = [ ];
-    };
+    loader.systemd-boot.enable = true;
+    initrd.kernelModules = [ ];
     kernelModules = [ ];
     extraModulePackages = [ ];
+    initrd.availableKernelModules = [
+      "ata_piix"
+      "uhci_hcd"
+      "virtio_pci"
+      "virtio_scsi"
+      "sd_mod"
+      "sr_mod"
+    ];
   };
 
   fileSystems."/" = {
-    device = "/dev/disk/by-uuid/e2536e0b-2f60-467e-b4a4-dcea2a4928ce";
+    device = "/dev/disk/by-partlabel/disk-sda-root";
     fsType = "ext4";
   };
 
   fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/913D-7694";
+    device = "/dev/disk/by-partlabel/disk-sda-ESP";
     fsType = "vfat";
   };
 
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.ens18.useDHCP = lib.mkDefault true;
+  networking.useDHCP = lib.mkDefault false;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 }
diff --git a/machines/dns01/beta.dgnum.eu.nix b/machines/dns01/beta.dgnum.eu.nix
index cfb6d7e..44d903d 100644
--- a/machines/dns01/beta.dgnum.eu.nix
+++ b/machines/dns01/beta.dgnum.eu.nix
@@ -16,7 +16,7 @@ with dns.lib.combinators;
   #AAAA = [ "4321:0:1:2:3:4:567:89ab" ];
 
   subdomains = {
-    photoprism = host "129.199.146.101" "";
-    immich = host "129.199.146.101" "";
+    photoprism = host "129.199.146.101" null;
+    immich = host "129.199.146.101" null;
   };
 }
diff --git a/machines/photo01/_hardware-configuration.nix b/machines/photo01/_hardware-configuration.nix
index e87eb0d..8b0d66a 100644
--- a/machines/photo01/_hardware-configuration.nix
+++ b/machines/photo01/_hardware-configuration.nix
@@ -16,7 +16,6 @@
       "sd_mod"
       "sr_mod"
     ];
-
   };
 
   fileSystems."/" = {