steveej-nuc7pjyh-work: use kernel from pkgs, enable extra users with posh

This commit is contained in:
steveej 2019-12-06 16:11:21 +01:00
parent 6f06311c04
commit 5e998992a5
2 changed files with 2 additions and 23 deletions

View file

@ -8,6 +8,7 @@
./system.nix ./system.nix
./hw.nix ./hw.nix
./user.nix
../../profiles/removable-medium/pkg.nix ../../profiles/removable-medium/pkg.nix
]; ];
} }

View file

@ -1,29 +1,7 @@
{ pkgs, lib, ... }: { pkgs, lib, ... }:
let let
sgx_linuxpackages = let
linux_sgx_pkg = { fetchurl, buildLinux, ... } @ args:
buildLinux (args // rec {
version = "5.4.0-rc3";
modDirVersion = version;
src = fetchurl {
url = "https://github.com/jsakkine-intel/linux-sgx/archive/v23.tar.gz";
sha256 = "11rwlwv7s071ia889dk1dgrxprxiwgi7djhg47vi56dj81jgib20";
};
kernelPatches = [];
extraConfig = ''
INTEL_SGX y
'';
extraMeta.branch = "5.4";
} // (args.argsOverride or {}));
linux_sgx = pkgs.callPackage linux_sgx_pkg{};
in
pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor linux_sgx);
in { in {
networking.hostName = "steveej-nuc7pjyh-work"; # Define your hostname. networking.hostName = "steveej-nuc7pjyh-work"; # Define your hostname.
boot.kernelPackages = lib.mkForce sgx_linuxpackages; boot.kernelPackages = lib.mkForce pkgs.linuxPackages_sgx_latest;
} }