updated to efi boot and resolved module paths

2026-07-19 06:27:22 +10:00
parent 79d2ed0314
commit 0900ff25ae
10 changed files with 19 additions and 180 deletions
@@ -18,6 +18,8 @@
      ../../modules/services/nextcloud-cron-job.nix
      ../../modules/services/docker-health-to-gotify.nix
      ../../modules/services/enable-rpcbind.nix
+      ../../modules/disko/proxmox.nix
+      ../../modules/boot/efi.nix
    ];


@@ -10,6 +10,8 @@
      ../../modules/common/configuration.nix
      ../../modules/nix-cache/server.nix
      ../../modules/beszel/enable-agent.nix
+      ../../modules/disko/proxmox.nix
+      ../../modules/boot/efi.nix
    ];

  networking.hostName = "nix-cache"; # Define your hostname.
@@ -28,8 +28,10 @@ in {
  imports =
    [ # Include the results of the hardware scan.
      ../../modules/common/configuration.nix
-      ../../modules/nix/cache-client.nix
-      ../../modules/nix/remote-builder-client.nix
+      ../../modules/nix-cache/client.nix
+      ../../modules/remote-builder-client.nix
+      ../../modules/disko/proxmox.nix
+      ../../modules/boot/efi.nix
    ];

  # Bootloader.
@@ -3,7 +3,7 @@
 {

    imports = [
-    ../../common/aliases.nix
+    ../../modules/common/aliases.nix
  ];

  home.username = "nixos";         # your actual username
@@ -94,9 +94,10 @@ in
  imports =
    [
      ../../modules/common/configuration.nix
-      ../../modules/nix/cache-client.nix
-      ../../modules/nix/remote-builder-client.nix
+      ../../modules/nix-cache/client.nix
+      ../../modules/remote-builder-client.nix
      ../../modules/disko/proxmox.nix
+      ../../modules/boot/efi.nix
    ];

  networking.hostName = "pxe-boot";
@@ -13,6 +13,8 @@
      ../../modules/services/enable-rpcbind.nix
      ../../modules/services/zfs/enable-service.nix
 #      ../../modules/services/zfs/auto-mount-volumes.nix
+      ../../modules/disko/proxmox.nix
+      ../../modules/boot/efi.nix
    ];