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..61def4d 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -8,54 +8,58 @@ (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 = { "/" = { - 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"; }; }; 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