From 5e998992a50de8bf15036f8bebb35602674ee6ba Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Fri, 6 Dec 2019 16:11:21 +0100
Subject: [PATCH] steveej-nuc7pjyh-work: use kernel from pkgs, enable extra
 users with posh

---
 .../steveej-nuc7pjyh-work/configuration.nix   |  1 +
 .../devices/steveej-nuc7pjyh-work/system.nix  | 24 +------------------
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/nix/os/devices/steveej-nuc7pjyh-work/configuration.nix b/nix/os/devices/steveej-nuc7pjyh-work/configuration.nix
index 2bf3a41..40aeaeb 100644
--- a/nix/os/devices/steveej-nuc7pjyh-work/configuration.nix
+++ b/nix/os/devices/steveej-nuc7pjyh-work/configuration.nix
@@ -8,6 +8,7 @@
 
     ./system.nix
     ./hw.nix
+    ./user.nix
     ../../profiles/removable-medium/pkg.nix
   ];
 }
diff --git a/nix/os/devices/steveej-nuc7pjyh-work/system.nix b/nix/os/devices/steveej-nuc7pjyh-work/system.nix
index fe22876..b04ec58 100644
--- a/nix/os/devices/steveej-nuc7pjyh-work/system.nix
+++ b/nix/os/devices/steveej-nuc7pjyh-work/system.nix
@@ -1,29 +1,7 @@
 { pkgs, lib, ... }:
 
 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 {
   networking.hostName = "steveej-nuc7pjyh-work"; # Define your hostname.
-  boot.kernelPackages = lib.mkForce sgx_linuxpackages;
+  boot.kernelPackages = lib.mkForce pkgs.linuxPackages_sgx_latest;
 }