delta/dotfiles
1
0
Fork 0
mirror of https://github.com/deltathetawastaken/dotfiles.git synced 2025-12-06 07:16:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

zfs on dlaptop

Browse source
This commit is contained in:
Your Name 2024-06-04 16:20:48 +00:00
parent 240763631e
commit a4144ec9fd
2 changed files with 45 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
hosts/dlaptop/hardware.nix
View file

@ -40,13 +40,6 @@
interval = "weekly"; interval = "weekly";
}; };
# nix.gc = {
# automatic = true;
# dates = "weekly";
# options = "--delete-older-than 7d";
# # randomizedDelaySec = "30m";
# };
programs.nh = { programs.nh = {
enable = true; enable = true;
clean.enable = true; clean.enable = true;
@ -65,22 +58,37 @@
]; ];
boot.kernelModules = [ "amd-pstate" "acpi_call" "amdgpu" "kvm-amd" "vfat" "nls_cp437" "nls_iso8859-1" ]; boot.kernelModules = [ "amd-pstate" "acpi_call" "amdgpu" "kvm-amd" "vfat" "nls_cp437" "nls_iso8859-1" ];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" "vfat" "nls_cp437" "nls_iso8859-1" ]; boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "usbhid" "sd_mod" "vfat" "nls_cp437" "nls_iso8859-1" ];
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.loader.efi.efiSysMountPoint = "/boot"; boot.loader.efi.efiSysMountPoint = "/boot";
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelPackages = unstable.linuxPackages_xanmod_latest; boot.kernelPackages = unstable.linuxPackages_xanmod_latest;
boot.extraModulePackages = with config.boot.kernelPackages; [ acpi_call cpupower ]; boot.extraModulePackages = with config.boot.kernelPackages; [ usbip.out ];
boot.kernelPackages =
with builtins; with lib; let
latestCompatibleVersion = config.boot.zfs.package.latestCompatibleLinuxPackages.kernel.version;
xanPackages = filterAttrs (name: packages: hasSuffix "_xanmod" name && (tryEval packages).success) pkgs.linuxKernel.packages;
compatiblePackages = filter (packages: compareVersions packages.kernel.version latestCompatibleVersion <= 0) (attrValues xanPackages);
orderedCompatiblePackages = sort (x: y: compareVersions x.kernel.version y.kernel.version > 0) compatiblePackages;
in head orderedCompatiblePackages;
fileSystems."/" = { boot.plymouth.enable = false;
device = "/dev/disk/by-uuid/6b2d5c46-92de-42d0-a272-16b7ef7f30af";
fsType = "ext4"; boot.supportedFilesystems = [ "zfs" ];
};
boot.initrd.extraUtilsCommands = ''
copy_bin_and_libs ${pkgs.multipath-tools}/bin/kpartx
'';
boot.initrd.luks = { boot.initrd.luks = {
yubikeySupport = true; yubikeySupport = true;
devices."cryptroot" = { devices."cryptroot0" = {
device = "/dev/nvme0n1p2"; device = "/dev/nvme0n1p2";
postOpenCommands = "
kpartx -u /dev/mapper/cryptroot0
kpartx -u /dev/mapper/cryptroot0p1
kpartx -u /dev/mapper/cryptroot0p2
";
yubikey = { yubikey = {
slot = 2; slot = 2;
gracePeriod = 7; gracePeriod = 7;
@ -97,14 +105,29 @@
}; };
fileSystems."/boot" = { fileSystems."/boot" = {
device = "/dev/disk/by-uuid/6770-34DC"; device = "/dev/disk/by-uuid/4E0B-6C2F";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = [{
device = "/var/lib/swapfile"; fileSystems."/" =
size = 32 * 1024; { device = "zroot/ROOT/default";
}]; fsType = "zfs";
};
fileSystems."/nix/store" =
{ device = "zroot/nix/store";
fsType = "zfs";
};
fileSystems."/var/log" =
{ device = "zroot/var/log";
fsType = "zfs";
};
swapDevices =
[ { device = "/dev/disk/by-uuid/a2ff20bd-56f3-4c83-b1b4-933ba0c82f36"; }
];
hardware.opengl = { hardware.opengl = {
enable = true; enable = true;
@ -118,6 +141,7 @@
}; };
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
networking.hostId = "11C0FFEE";
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

2
hosts/dlaptop/system.nix
View file

@ -156,6 +156,8 @@
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
multipath-tools #ZFS in LUKS mount
openvpn openvpn
any-nix-shell any-nix-shell
comma comma