3 files changed, 32 insertions, 57 deletions
diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix
index b77bbb3..3012da5 100644
--- a/hosts/laptop/configuration.nix
+++ b/hosts/laptop/configuration.nix
@@ -3,9 +3,6 @@
   system.stateVersion = "25.05";
 
   imports = [
-      inputs.disko.nixosModules.disko
-      ./disko.nix
-
       ./hardware-configuration.nix
       ../../sys/default.nix
     ];
diff --git a/hosts/laptop/disko.nix b/hosts/laptop/disko.nix
deleted file mode 100644
index 6b9951a..0000000
--- a/hosts/laptop/disko.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  disko.devices = {
-  disk = {
-    main = {
-      type = "disk";
-      device = "/dev/nvme0n1";
-      content = {
-        type = "gpt";
-        partitions = {
-          ESP = {
-            size = "512M";
-            type = "EF00";
-            priority = 1;
-            content = {
-              type = "filesystem";
-              format = "vfat";
-              mountpoint = "/boot";
-              mountOptions = [ "umask=0077" ];
-            };
-          };
-          nixos = {
-            size = "200G";
-            content = {
-              type = "btrfs";
-              extraArgs = [ "-f" ];
-              subvolumes = {
-                "/root" = {
-                  mountpoint = "/";
-                  mountOptions = [ "noatime" ];
-                };
-                "/nix" = {
-                  mountpoint = "/nix";
-                  mountOptions = [ "compress=zstd:1" "noatime" ];
-                };
-                "/home" = {
-                  mountpoint = "/home";
-                  mountOptions = [ "noatime" ];
-                };
-                "/swap" = {
-                  mountpoint = "/.swapvol/swapfile";
-                  swap.swapfile.size = "8G";
-                };
-              };
-            };
-          };
-          fedora = {
-            size = "100%";
-          };
-        };
-      };
-    };
-  };
-  };
-}
diff --git a/hosts/laptop/hardware-configuration.nix b/hosts/laptop/hardware-configuration.nix
index 5e029fd..527535a 100644
--- a/hosts/laptop/hardware-configuration.nix
+++ b/hosts/laptop/hardware-configuration.nix
@@ -13,6 +13,38 @@
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/3ad0b58c-eb15-475d-b29d-e9dd0c0f5e79";
+      fsType = "btrfs";
+      options = [ "subvol=root" ];
+    };
+
+  fileSystems."/nix" =
+    { device = "/dev/disk/by-uuid/3ad0b58c-eb15-475d-b29d-e9dd0c0f5e79";
+      fsType = "btrfs";
+      options = [ "subvol=nix" ];
+    };
+
+  fileSystems."/home" =
+    { device = "/dev/disk/by-uuid/3ad0b58c-eb15-475d-b29d-e9dd0c0f5e79";
+      fsType = "btrfs";
+      options = [ "subvol=home" ];
+    };
+
+  fileSystems."/.swapvol" =
+    { device = "/dev/disk/by-uuid/3ad0b58c-eb15-475d-b29d-e9dd0c0f5e79";
+      fsType = "btrfs";
+      options = [ "subvol=swap" ];
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/EEF5-007B";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
+
+  swapDevices = [ ];
+
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }