Merge staging to master #12

Merged
steveej merged 30 commits from staging into master 2018-11-10 11:10:55 +00:00
4 changed files with 23 additions and 9 deletions
Showing only changes of commit ed6aac6185 - Show all commits

View file

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

View file

@ -8,5 +8,6 @@
./system.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
hardware.encryptedDisk = {
@ -7,12 +17,8 @@
diskId = "nvme-SAMSUNG_MZVLW256HEHP-000L7_S35ENX0K827498";
};
boot.initrd.availableKernelModules = [
"aesni_intel"
"kvm-intel"
"aes_x86_64"
];
# boot.initrd.availableKernelModules = stage1Modules;
boot.initrd.kernelModules = stage1Modules;
boot.extraModprobeConfig = ''
options kvm-intel nested=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;
}