From 2566c3b750a6a0550a70a262903cae4ec606a745 Mon Sep 17 00:00:00 2001
From: illustris <rharikrishnan95@gmail.com>
Date: Mon, 24 Oct 2022 18:35:55 +0530
Subject: [PATCH 1/2] change ZFS mountpoints

---
 configuration.nix          |  2 +-
 flake.nix                  |  1 -
 hardware-configuration.nix | 18 +++++++++---------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 8dc9a13..371382d 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -32,7 +32,7 @@ in
 		};
 
 		supportedFilesystems = [ "zfs" "ntfs" ];
-		zfs.devNodes = "/dev/disk/by-partuuid";
+		zfs.devNodes = "/dev/disk/by-path";
 	};
 
 	time.timeZone = "Asia/Kolkata";
diff --git a/flake.nix b/flake.nix
index eda83ac..27603b9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,6 @@
 
 	inputs = {
 		nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-		# nixpkgs1.url = "/home/illustris/src/nixpkgs";
 		home-manager = {
 			url = "github:nix-community/home-manager";
 			inputs.nixpkgs.follows = "nixpkgs";
diff --git a/hardware-configuration.nix b/hardware-configuration.nix
index 6525d9a..9b04ac3 100644
--- a/hardware-configuration.nix
+++ b/hardware-configuration.nix
@@ -15,47 +15,47 @@
 
 	fileSystems = {
 		"/" = {
-			device = "ssd/rootfs";
+			device = "desktop-nvme/rootfs";
 			fsType = "zfs";
 		};
 
 		"/home" = {
-			device = "ssd/home";
+			device = "desktop-nvme/home";
 			fsType = "zfs";
 		};
 
 		"/nix" = {
-			device = "ssd/nix";
+			device = "desktop-nvme/nix";
 			fsType = "zfs";
 		};
 
 		"/root" = {
-			device = "ssd/home/root";
+			device = "desktop-nvme/home/root";
 			fsType = "zfs";
 		};
 
 		"/tmp" = {
-			device = "ssd/tmp";
+			device = "desktop-nvme/tmp";
 			fsType = "zfs";
 		};
 
 		"/var" = {
-			device = "ssd/var";
+			device = "desktop-nvme/var";
 			fsType = "zfs";
 		};
 
 		"/var/lib" = {
-			device = "ssd/var/lib";
+			device = "desktop-nvme/var/lib";
 			fsType = "zfs";
 		};
 
 		"/var/log" = {
-			device = "ssd/var/log";
+			device = "desktop-nvme/var/log";
 			fsType = "zfs";
 		};
 
 		"/boot" = {
-			device = "/dev/disk/by-uuid/453B-D3CD";
+			device = "/dev/disk/by-uuid/9807-6F26";
 			fsType = "vfat";
 		};
 	};
-- 
2.48.1


From fdb13b8226dce77317ee9cb2920f166fb7f9b273 Mon Sep 17 00:00:00 2001
From: illustris <rharikrishnan95@gmail.com>
Date: Wed, 9 Nov 2022 09:44:06 +0530
Subject: [PATCH 2/2] add nvme to initramfs

---
 configuration.nix          |  2 +-
 hardware-configuration.nix | 12 ++++++++----
 mount.sh                   | 13 +++++++++++++
 unmount.sh                 |  4 ++++
 4 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 mount.sh
 create mode 100644 unmount.sh

diff --git a/configuration.nix b/configuration.nix
index 371382d..8dc9a13 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -32,7 +32,7 @@ in
 		};
 
 		supportedFilesystems = [ "zfs" "ntfs" ];
-		zfs.devNodes = "/dev/disk/by-path";
+		zfs.devNodes = "/dev/disk/by-partuuid";
 	};
 
 	time.timeZone = "Asia/Kolkata";
diff --git a/hardware-configuration.nix b/hardware-configuration.nix
index 9b04ac3..61def4d 100644
--- a/hardware-configuration.nix
+++ b/hardware-configuration.nix
@@ -8,10 +8,14 @@
 		(modulesPath + "/profiles/qemu-guest.nix")
 	];
 
-	boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "sr_mod" "virtio_blk" ];
-	boot.initrd.kernelModules = [ ];
-	boot.kernelModules = [ "v4l2loopback" ];
-	boot.extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ];
+	boot = {
+		initrd = {
+			availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "sr_mod" "virtio_blk" "nvme" ];
+			kernelModules = [ ];
+		};
+		kernelModules = [ "v4l2loopback" ];
+		extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ];
+	};
 
 	fileSystems = {
 		"/" = {
diff --git a/mount.sh b/mount.sh
new file mode 100644
index 0000000..d597526
--- /dev/null
+++ b/mount.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+set -x
+sudo zpool import desktop-nvme
+sudo mount -t zfs desktop-nvme/rootfs /mnt/
+sudo mount "/dev/disk/by-uuid/9807-6F26" /mnt/boot
+sudo mount -t zfs desktop-nvme/nix /mnt/nix
+sudo mount -t zfs desktop-nvme/home/root /mnt/root
+sudo mount -t zfs desktop-nvme/home /mnt/home
+sudo mount -t zfs desktop-nvme/var /mnt/var
+sudo mount -t zfs desktop-nvme/var/lib /mnt/var/lib
+sudo mount -t zfs desktop-nvme/var/log /mnt/var/log
+
diff --git a/unmount.sh b/unmount.sh
new file mode 100644
index 0000000..54cae99
--- /dev/null
+++ b/unmount.sh
@@ -0,0 +1,4 @@
+set -x
+set -e
+sudo umount -R /mnt
+sudo zpool export desktop-nvme
-- 
2.48.1