Fix shiro hardware config

This commit is contained in:
Henrik Lissner 2020-01-17 05:47:43 -05:00
parent 0a5249fd9a
commit 9ebd743f78
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 14 additions and 14 deletions

View file

@ -41,13 +41,4 @@
powerManagement.powertop.enable = true;
# Monitor backlight control
programs.light.enable = true;
# Encrypted /home
boot.initrd.luks.devices = [
{
name = "home";
device = "/dev/nvme0n1p8";
preLVM = true;
allowDiscards = true;
}
];
}

View file

@ -5,11 +5,11 @@
{
imports = [
<nixpkgs/nixos/modules/installer/scan/not-detected.nix>
(let nixos-hardware =
builtins.fetchTarball
https://github.com/NixOS/nixos-hardware/archive/master.tar.gz;
in "${nixos-hardware}/dell/xps/13-9370")
<nixpkgs/nixos/modules/installer/scan/not-detected.nix>
];
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "rtsx_pci_sdmmc" ];
@ -22,21 +22,30 @@
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
## SSDs
services.fstrim.enable = true;
# services.fstrim.enable = true;
fileSystems = {
"/" = {
device = "/dev/disk/by-uuid/nixos";
device = "/dev/disk/by-label/nixos";
fsType = "ext4";
options = [ "noatime" ];
};
"/boot" = {
device = "/dev/disk/by-uuid/BOOT";
device = "/dev/disk/by-label/BOOT";
fsType = "vfat";
};
"/home" = {
device = "/dev/disk/by-uuid/home";
device = "/dev/disk/by-label/home";
fsType = "ext4";
options = [ "noatime" ];
};
};
swapDevices = [ { device = "/dev/disk/by-label/swap"; }];
# Encrypted /home
boot.initrd.luks.devices = [{
name = "home";
device = "/dev/nvme0n1p8";
preLVM = true;
allowDiscards = true;
}];
}