illustris/desktop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request 'migrate from SATA to NVMe' (#1) from new-disk into master

Browse Source 
Reviewed-on: #1
This commit is contained in:
illustris 2022-11-09 04:16:55 +00:00
commit 896ac0f6ec
4 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flake.nix
View File

@ -3,7 +3,6 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
# nixpkgs1.url = "/home/illustris/src/nixpkgs";
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

30
hardware-configuration.nix
View File

@ -8,54 +8,58 @@
(modulesPath + "/profiles/qemu-guest.nix") (modulesPath + "/profiles/qemu-guest.nix")
]; ];
boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "sr_mod" "virtio_blk" ]; boot = {
boot.initrd.kernelModules = [ ]; initrd = {
boot.kernelModules = [ "v4l2loopback" ]; availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "sr_mod" "virtio_blk" "nvme" ];
boot.extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ]; kernelModules = [ ];
};
kernelModules = [ "v4l2loopback" ];
extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ];
};
fileSystems = { fileSystems = {
"/" = { "/" = {
device = "ssd/rootfs"; device = "desktop-nvme/rootfs";
fsType = "zfs"; fsType = "zfs";
}; };
"/home" = { "/home" = {
device = "ssd/home"; device = "desktop-nvme/home";
fsType = "zfs"; fsType = "zfs";
}; };
"/nix" = { "/nix" = {
device = "ssd/nix"; device = "desktop-nvme/nix";
fsType = "zfs"; fsType = "zfs";
}; };
"/root" = { "/root" = {
device = "ssd/home/root"; device = "desktop-nvme/home/root";
fsType = "zfs"; fsType = "zfs";
}; };
"/tmp" = { "/tmp" = {
device = "ssd/tmp"; device = "desktop-nvme/tmp";
fsType = "zfs"; fsType = "zfs";
}; };
"/var" = { "/var" = {
device = "ssd/var"; device = "desktop-nvme/var";
fsType = "zfs"; fsType = "zfs";
}; };
"/var/lib" = { "/var/lib" = {
device = "ssd/var/lib"; device = "desktop-nvme/var/lib";
fsType = "zfs"; fsType = "zfs";
}; };
"/var/log" = { "/var/log" = {
device = "ssd/var/log"; device = "desktop-nvme/var/log";
fsType = "zfs"; fsType = "zfs";
}; };
"/boot" = { "/boot" = {
device = "/dev/disk/by-uuid/453B-D3CD"; device = "/dev/disk/by-uuid/9807-6F26";
fsType = "vfat"; fsType = "vfat";
}; };
}; };

13
mount.sh Normal file
View File

@ -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

4
unmount.sh Normal file
View File

@ -0,0 +1,4 @@
set -x
set -e
sudo umount -R /mnt
sudo zpool export desktop-nvme