schmittlauch/nixconfigs
2
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

move nixos-hardware import to hardware configuration

Browse source
This commit is contained in:
Trolli Schmittlauch 2020-04-05 21:53:45 +02:00
parent 7f382ea07c
commit 28d1fe6bbc
2 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
nixos/configuration.nix
View file

@ -15,12 +15,6 @@ in
# Include the results of the hardware scan. # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
./packages.nix ./packages.nix
(
builtins.fetchGit {
url = "https://github.com/NixOS/nixos-hardware";
rev = "62a1812f3c20b7119013650f926806fecd956574";
} + "/lenovo/thinkpad/t440s"
)
# home manager integration # home manager integration
<home-manager/nixos> <home-manager/nixos>
]; ];

21
nixos/hardware-configuration.nix
View file

@ -2,7 +2,14 @@
{ {
imports = 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.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
@ -10,23 +17,27 @@
boot.extraModulePackages = []; boot.extraModulePackages = [];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/cb5998ae-cfc9-447f-8756-1ceaec6ca4c4"; {
device = "/dev/disk/by-uuid/cb5998ae-cfc9-447f-8756-1ceaec6ca4c4";
fsType = "btrfs"; fsType = "btrfs";
}; };
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/DED9-661B"; {
device = "/dev/disk/by-uuid/DED9-661B";
fsType = "vfat"; fsType = "vfat";
options = [ "discard" ]; options = [ "discard" ];
}; };
fileSystems."/home" = fileSystems."/home" =
{ device = "/dev/disk/by-uuid/cb5998ae-cfc9-447f-8756-1ceaec6ca4c4"; {
device = "/dev/disk/by-uuid/cb5998ae-cfc9-447f-8756-1ceaec6ca4c4";
fsType = "btrfs"; fsType = "btrfs";
}; };
swapDevices = 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; nix.maxJobs = lib.mkDefault 4;