steveej-t480-work: add NVMe support and user packages

This commit is contained in:
steveej 2018-11-05 14:31:58 +01:00
parent 8baa3cf42d
commit ed6aac6185
4 changed files with 23 additions and 9 deletions

View file

@ -1,10 +1,10 @@
{ pkgs { pkgs
, config, , config
... }: , ... }:
let let
# gitpkgs = import /home/steveej/src/github/NixOS/nixpkgs {}; # gitpkgs = import /home/steveej/src/github/NixOS/nixpkgs {};
unstablepkgs = import <nixos-unstable> {}; unstablepkgs = import <nixos-unstable> { config = config.nixpkgs.config; };
in { in {
imports = [ imports = [

View file

@ -8,5 +8,6 @@
./system.nix ./system.nix
./hw.nix ./hw.nix
./pkg.nix
]; ];
} }

View file

@ -1,5 +1,15 @@
{ ... }: { ... }:
let
stage1Modules = [
"aesni_intel"
"kvm-intel"
"aes_x86_64"
"nvme"
"nvme_core"
];
in
{ {
# TASK: new device # TASK: new device
hardware.encryptedDisk = { hardware.encryptedDisk = {
@ -7,12 +17,8 @@
diskId = "nvme-SAMSUNG_MZVLW256HEHP-000L7_S35ENX0K827498"; diskId = "nvme-SAMSUNG_MZVLW256HEHP-000L7_S35ENX0K827498";
}; };
boot.initrd.availableKernelModules = [ # boot.initrd.availableKernelModules = stage1Modules;
"aesni_intel" boot.initrd.kernelModules = stage1Modules;
"kvm-intel"
"aes_x86_64"
];
boot.extraModprobeConfig = '' boot.extraModprobeConfig = ''
options kvm-intel nested=1 options kvm-intel nested=1
options kvm-intel enable_shadow_vmcs=1 options kvm-intel enable_shadow_vmcs=1

View file

@ -0,0 +1,7 @@
{
...
}:
{
home-manager.users.steveej = import ../../../home-manager/configuration/graphical-fullblown.nix;
}