From fd5a75eebb811474c893086737456244485096ea Mon Sep 17 00:00:00 2001
From: Bryan Ramos <bryan@ramos.codes>
Date: Thu, 21 Nov 2024 21:20:53 -0500
Subject: [PATCH] fstab changes

---
 src/system/machines/desktop/hardware.nix      |  6 +-
 .../desktop/modules/disko/default.nix         | 72 +++++--------------
 src/system/machines/desktop/system.nix        | 14 ++--
 3 files changed, 31 insertions(+), 61 deletions(-)

diff --git a/src/system/machines/desktop/hardware.nix b/src/system/machines/desktop/hardware.nix
index 5d4b3bd..b3e6ef2 100644
--- a/src/system/machines/desktop/hardware.nix
+++ b/src/system/machines/desktop/hardware.nix
@@ -30,17 +30,17 @@
 
   fileSystems = {
     "/" = {
-      device = "/dev/disk/by-uuid/8a323092-39b9-4913-8839-452156e48922";
+      device = "/dev/disk/by-uuid/495f5e7b-d9e4-4663-88c5-7021e7292535";
       fsType = "ext4";
     };
 
     "/home" = {
-      device = "/dev/disk/by-uuid/84474517-05eb-45aa-880e-c18301483b53";
+      device = "/dev/disk/by-uuid/cd0e5c29-716d-47f2-92f4-46ee9fca5af3";
       fsType = "ext4";
     };
 
     "/boot" = {
-      device = "/dev/disk/by-uuid/B4B2-C898";
+      device = "/dev/disk/by-uuid/C061-EE77";
       fsType = "vfat";
     };
   };
diff --git a/src/system/machines/desktop/modules/disko/default.nix b/src/system/machines/desktop/modules/disko/default.nix
index 3dc5c09..5bf5734 100644
--- a/src/system/machines/desktop/modules/disko/default.nix
+++ b/src/system/machines/desktop/modules/disko/default.nix
@@ -1,62 +1,41 @@
-{ disks ? [ "/dev/nvme0n1" "/dev/sdb" ], ... }:
+let
+  dev = "/dev/disk/by-id/ata-CT2000MX500SSD1_2137E5D2D47D";
 
+in
 {
   disko.devices = {
     disk = {
       one = {
         type = "disk";
-        device = builtins.elemAt disks 0;
+        device = dev;
         content = {
           type = "table";
           format = "gpt";
-          partitions = [
-            {
-              name = "boot";
-              start = "0";
-              end = "200M";
-              fs-type = "fat32";
-              bootable = true;
+          partitions = {
+            boot = {
+              size = "1G";
+              type = "EF00";
               content = {
                 type = "filesystem";
                 format = "vfat";
                 mountpoint = "/boot";
+                mountOptions = [ "umask=0077" ];
               };
-            }
-            {
-              start = "200M";
-              end = "100%FREE";
+            };
+            primary = {
+              size = "100%";
               content = {
                 type = "lvm_pv";
-                vg = "stick";
+                vg = "nix";
               };
-            }
-          ];
-        };
-      };
-    };
-    disk = {
-      two = {
-        type = "disk";
-        device = builtins.elemAt disks 1;
-        content = {
-          type = "table";
-          format = "gpt";
-          partitions = [
-            {
-              start = "0";
-              end = "100%FREE";
-              content = {
-                type = "lvm_pv";
-                vg = "ssd";
-              };
-            }
-          ];
+            };
+          };
         };
       };
     };
 
     lvm_vg = {
-      stick = {
+      nix = {
         type = "lvm_vg";
         lvs = {
           aaa = {
@@ -66,9 +45,9 @@
             size = "1M";
           };
           root = {
-            size = "100%";
+            size = "252G";
             content = {
-              name = "NixOS";
+              name = "root";
               type = "filesystem";
               format = "ext4";
               mountpoint = "/";
@@ -77,21 +56,8 @@
               ];
             };
           };
-        };
-      };
-    };
-    lvm_vg = {
-      ssd = {
-        type = "lvm_vg";
-        lvs = {
-          aaa = {
-            size = "1M";
-          };
-          zzz = {
-            size = "1M";
-          };
           home = {
-            size = "200G";
+            size = "100%FREE";
             content = {
               name = "home";
               type = "filesystem";
diff --git a/src/system/machines/desktop/system.nix b/src/system/machines/desktop/system.nix
index 44c4321..79332cc 100644
--- a/src/system/machines/desktop/system.nix
+++ b/src/system/machines/desktop/system.nix
@@ -33,12 +33,16 @@
 
   boot.loader = {
     timeout = null;
-    grub = {
+    #grub = {
+    #  enable = true;
+    #  devices = [ "nodev" ];
+    #  efiSupport = true;
+    #  configurationLimit = 3;
+    #  splashImage = null;
+    #};
+
+    systemd-boot = {
       enable = true;
-      devices = [ "nodev" ];
-      efiSupport = true;
-      configurationLimit = 3;
-      splashImage = null;
     };
 
     efi = {