Modularize disko everywhere

1 files changed, 19 insertions, 48 deletions

diff --git a/hosts/ginaz/hardware-configuration.nix b/hosts/ginaz/hardware-configuration.nix
index 6a773e6..cbfda8a 100644
--- a/hosts/ginaz/hardware-configuration.nix
+++ b/hosts/ginaz/hardware-configuration.nix
@@ -13,57 +13,28 @@
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "rpool/local/root";
-      fsType = "zfs";
+  hardware = {
+    bluetooth.enable = true;
+    #bluetooth.powerOnBoot = true;
+
+    graphics = {
+      enable = true;
+      extraPackages = with pkgs; [ nvidia-vaapi-driver ];
+      extraPackages32 = with pkgs.pkgsi686Linux; [ nvidia-vaapi-driver ];
     };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-label/boot";
-      fsType = "vfat";
-    };
-
-  fileSystems."/nix" =
-    { device = "rpool/local/nix";
-      fsType = "zfs";
-    };
-
-  fileSystems."/root" =
-    { device = "rpool/user/home/root";
-      fsType = "zfs";
-    };
-
-  fileSystems."/home/nipsy" =
-    { device = "rpool/user/home/nipsy";
-      fsType = "zfs";
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-label/swap"; }
-    ];
-
-    hardware = {
-      bluetooth.enable = true;
-      #bluetooth.powerOnBoot = true;
-
-      graphics = {
-        enable = true;
-        extraPackages = with pkgs; [ nvidia-vaapi-driver ];
-        extraPackages32 = with pkgs.pkgsi686Linux; [ nvidia-vaapi-driver ];
-      };
-
-      nvidia = {
-        modesetting.enable = true;
-        open = true;
-        package = config.boot.kernelPackages.nvidiaPackages.beta;
-        prime = {
-          amdgpuBusId = "PCI:4:0:0";
-          nvidiaBusId = "PCI:1:0:0";
-          offload = {
-            enable = true;
-            enableOffloadCmd = true;
-          };
+    nvidia = {
+      modesetting.enable = true;
+      open = true;
+      package = config.boot.kernelPackages.nvidiaPackages.beta;
+      prime = {
+        amdgpuBusId = "PCI:4:0:0";
+        nvidiaBusId = "PCI:1:0:0";
+        offload = {
+          enable = true;
+          enableOffloadCmd = true;
         };
       };
     };
+  };
 }