Preparing to migrate to a new pool. Oh my goodness, I'm scared.

This commit is contained in:
kat witch 2020-12-05 23:48:28 +00:00 committed by kat
parent 31d8f7ed65
commit dd06864d3d
4 changed files with 45 additions and 34 deletions

View file

@ -4,49 +4,58 @@
{ config, lib, pkgs, modulesPath, ... }: { config, lib, pkgs, modulesPath, ... }:
{ {
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = { fileSystems."/" =
device = "zroot/safe/root"; { device = "rpool/safe/root";
fsType = "zfs"; fsType = "zfs";
}; };
fileSystems."/home" = { fileSystems."/home" =
device = "zroot/safe/home"; { device = "rpool/safe/home";
fsType = "zfs"; fsType = "zfs";
}; };
fileSystems."/boot" = { fileSystems."/nix" =
device = "/dev/disk/by-uuid/50C3-BE99"; { device = "rpool/local/nix";
fsType = "zfs";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/AED6-D0D1";
fsType = "vfat"; fsType = "vfat";
}; };
fileSystems."/disks/pool-protect" = { fileSystems."/disks/pool-compress" =
device = "zstore/protect"; { device = "zstore/compress";
fsType = "zfs"; fsType = "zfs";
}; };
fileSystems."/disks/pool-raw" = { fileSystems."/disks/pool-protect" =
device = "zstore/raw"; { device = "zstore/protect";
fsType = "zfs"; fsType = "zfs";
}; };
fileSystems."/disks/pool-compress" = { fileSystems."/disks/pool-raw" =
device = "zstore/compress"; { device = "zstore/raw";
fsType = "zfs"; fsType = "zfs";
}; };
fileSystems."/disks/excess" = { fileSystems."/disks/excess" =
device = "/dev/disk/by-uuid/0af88a48-ccfd-4e54-9652-a5ae7f74e21d"; { device = "/dev/disk/by-uuid/0af88a48-ccfd-4e54-9652-a5ae7f74e21d";
fsType = "xfs"; fsType = "xfs";
}; };
swapDevices = swapDevices =
[{ device = "/dev/disk/by-uuid/88595373-9566-401b-8c9b-03bbc8314f1b"; }]; [ { device = "/dev/disk/by-uuid/8f944315-fe1c-4095-90ce-50af03dd5e3f"; }
{ device = "/dev/disk/by-uuid/89831a0f-93e6-4d30-85e4-09061259f140"; }
];
} }

View file

@ -14,7 +14,7 @@
in { in {
enable = true; enable = true;
home = "/disks/pool-raw/transmission"; home = "/disks/pool-raw/transmission";
downloadDirPermissions = "755"; downloadDirPermissions = "777";
settings = { settings = {
download-dir = "/disks/pool-raw/Public/Media/"; download-dir = "/disks/pool-raw/Public/Media/";
incomplete-dir = "/disks/pool-raw/Public/Media/.incomplete"; incomplete-dir = "/disks/pool-raw/Public/Media/.incomplete";

View file

@ -51,6 +51,7 @@ in {
rsync rsync
pv pv
progress progress
ffmpeg-full
bc bc
zstd zstd
file file

View file

@ -16,20 +16,21 @@ in {
pkgs.mpv pkgs.mpv
pkgs.mumble pkgs.mumble
pkgs.vlc pkgs.vlc
nixpkgs-master.pkgs.syncplay nixpkgs-master.syncplay
nixpkgs-master.pkgs.youtube-dl nixpkgs-master.youtube-dl
nixpkgs-master.google-chrome nixpkgs-master.google-chrome
pkgs.v4l-utils pkgs.v4l-utils
pkgs.transmission-gtk pkgs.transmission-gtk
pkgs.jdk11 pkgs.jdk11
pkgs.lm_sensors pkgs.lm_sensors
pkgs.discord nixpkgs-master.discord
pkgs.tdesktop pkgs.tdesktop
pkgs.dino pkgs.dino
pkgs.vegur pkgs.vegur
pkgs.nitrogen pkgs.nitrogen
pkgs.terminator pkgs.terminator
pkgs.appimage-run pkgs.appimage-run
pkgs.gparted
pkgs.scrot pkgs.scrot
pkgs.gimp pkgs.gimp
pkgs.vscode pkgs.vscode