From 0198b29594e930e1500cc7e16604b95d9c94f98d Mon Sep 17 00:00:00 2001
From: iFargle <albert@sysctl.io>
Date: Thu, 5 Oct 2023 13:01:40 +0900
Subject: [PATCH] Test

---
 nixos/hosts/osaka-vultr-01/default.nix |  2 +-
 nixos/hosts/osaka-vultr-01/disks.nix   | 37 +++++++++-----------------
 2 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/nixos/hosts/osaka-vultr-01/default.nix b/nixos/hosts/osaka-vultr-01/default.nix
index 8d0e60b7..4a18e9eb 100644
--- a/nixos/hosts/osaka-vultr-01/default.nix
+++ b/nixos/hosts/osaka-vultr-01/default.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, modulesPath, desktop, username, ... }: {
   imports = [ 
     # This machine won't be using secureboot
-    ../../common/modules/boot.nixz
+    # ../../common/modules/boot.nix
     ./disks.nix
   ];
   nixpkgs.config.allowUnfree = false;
diff --git a/nixos/hosts/osaka-vultr-01/disks.nix b/nixos/hosts/osaka-vultr-01/disks.nix
index 916310b3..370e3505 100644
--- a/nixos/hosts/osaka-vultr-01/disks.nix
+++ b/nixos/hosts/osaka-vultr-01/disks.nix
@@ -6,30 +6,19 @@
 
   disko.devices.disk.vda = {
     device = "/dev/vda";
+    type = "disk";
     content = {
-      type = "table";
-      format = "gpt";
-      partitions = [ 
-        {
-          name = "BOOT";
-          start = "0%";
-          end = "550MiB";
-          bootable = true;
-          flags = [ "esp" ];
-          fs-type = "fat32";
-          content = {
-            type = "filesystem";
-            format = "vfat";
-            mountpoint = "/boot";
-          };
-        } # partition 1 (ESP)
-        {
-          name = "LUKS";
-          start = "550MiB";
-          end = "100%";
+      type = "gpt";
+      partitions = {
+        boot = {
+          size = "1M";
+          type = "EF02";
+        }; # partitions.boot
+        luks = {
+          size = "100%";
           content = {
             type = "luks";
-            name = "ROOT";
+            name = "crypted";
             extraOpenArgs = [ "--allow-discards" ];
             content = {
               type = "btrfs";
@@ -48,10 +37,10 @@
                   mountOptions = [ "compress=zstd" "noatime" ];
                 }; # nix
               }; # subvolumes
-            }; # content.content
+            };# content
           }; # content
-        } # partition 2 (/ BTRFS)
-      ]; # partitions
+        }; # luks.partitions
+      }; # partitions
     }; # content
   }; # disko.devices.disk.vda
 } # root
\ No newline at end of file