move nixos-hardware import to hardware configuration
parent
7f382ea07c
commit
28d1fe6bbc
|
@ -15,12 +15,6 @@ in
|
|||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
./packages.nix
|
||||
(
|
||||
builtins.fetchGit {
|
||||
url = "https://github.com/NixOS/nixos-hardware";
|
||||
rev = "62a1812f3c20b7119013650f926806fecd956574";
|
||||
} + "/lenovo/thinkpad/t440s"
|
||||
)
|
||||
# home manager integration
|
||||
<home-manager/nixos>
|
||||
];
|
||||
|
|
|
@ -2,31 +2,42 @@
|
|||
|
||||
{
|
||||
imports =
|
||||
[ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
|
||||
[
|
||||
<nixpkgs/nixos/modules/installer/scan/not-detected.nix>
|
||||
(
|
||||
builtins.fetchGit {
|
||||
url = "https://github.com/NixOS/nixos-hardware";
|
||||
rev = "62a1812f3c20b7119013650f926806fecd956574";
|
||||
} + "/lenovo/thinkpad/t440s"
|
||||
)
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/cb5998ae-cfc9-447f-8756-1ceaec6ca4c4";
|
||||
{
|
||||
device = "/dev/disk/by-uuid/cb5998ae-cfc9-447f-8756-1ceaec6ca4c4";
|
||||
fsType = "btrfs";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/DED9-661B";
|
||||
{
|
||||
device = "/dev/disk/by-uuid/DED9-661B";
|
||||
fsType = "vfat";
|
||||
options = [ "discard" ];
|
||||
};
|
||||
|
||||
fileSystems."/home" =
|
||||
{ device = "/dev/disk/by-uuid/cb5998ae-cfc9-447f-8756-1ceaec6ca4c4";
|
||||
{
|
||||
device = "/dev/disk/by-uuid/cb5998ae-cfc9-447f-8756-1ceaec6ca4c4";
|
||||
fsType = "btrfs";
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/bf928178-4e92-4e7e-8df2-18fbd658eecf"; }
|
||||
[
|
||||
{ device = "/dev/disk/by-uuid/bf928178-4e92-4e7e-8df2-18fbd658eecf"; }
|
||||
];
|
||||
|
||||
nix.maxJobs = lib.mkDefault 4;
|
||||
|
|
Loading…
Reference in New Issue