From fea70ef0004ba256a2cd74a54669fa0a469b8ca9 Mon Sep 17 00:00:00 2001 From: illustris Date: Wed, 9 Nov 2022 09:44:06 +0530 Subject: [PATCH] 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 66c2f54..5ac57aa 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