From 1c845922c1d3e425f72c41e9df01acae08cee476 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Sat, 30 Jan 2021 18:03:29 +0100
Subject: [PATCH] steveej-t14: enable brave and use amdgpu videodriver

---
 nix/home-manager/programs/chromium.nix       | 4 ++++
 nix/os/devices/steveej-t14/boot.nix          | 2 ++
 nix/os/devices/steveej-t14/configuration.nix | 1 +
 nix/os/devices/steveej-t14/hw.nix            | 4 ++--
 nix/os/devices/steveej-t14/system.nix        | 7 +++----
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/nix/home-manager/programs/chromium.nix b/nix/home-manager/programs/chromium.nix
index 0585746..dabe56b 100644
--- a/nix/home-manager/programs/chromium.nix
+++ b/nix/home-manager/programs/chromium.nix
@@ -7,6 +7,10 @@
     enable = true;
   };
 
+  programs.brave = {
+    enable = true;
+  };
+
   nixpkgs.config = {
     chromium = {
       # 2019-03-05: missing on 19.03 enablePepperPDF = true;
diff --git a/nix/os/devices/steveej-t14/boot.nix b/nix/os/devices/steveej-t14/boot.nix
index 2f5f8ea..645f6ca 100644
--- a/nix/os/devices/steveej-t14/boot.nix
+++ b/nix/os/devices/steveej-t14/boot.nix
@@ -1,8 +1,10 @@
 { lib
+, pkgs
 , ...
 }:
 
 {
   boot.loader.grub.efiInstallAsRemovable = lib.mkForce true;
   boot.loader.efi.canTouchEfiVariables = lib.mkForce false; 
+  boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest;
 }
diff --git a/nix/os/devices/steveej-t14/configuration.nix b/nix/os/devices/steveej-t14/configuration.nix
index b78c268..f03e698 100644
--- a/nix/os/devices/steveej-t14/configuration.nix
+++ b/nix/os/devices/steveej-t14/configuration.nix
@@ -10,5 +10,6 @@
     ./hw.nix
     ./pkg.nix
     ./user.nix
+    ./boot.nix
   ];
 }
diff --git a/nix/os/devices/steveej-t14/hw.nix b/nix/os/devices/steveej-t14/hw.nix
index 4438fda..bc5c3fa 100644
--- a/nix/os/devices/steveej-t14/hw.nix
+++ b/nix/os/devices/steveej-t14/hw.nix
@@ -3,8 +3,7 @@
 let
   stage1Modules =  [
     "aesni_intel"
-    "kvm-intel"
-    "aes_x86_64"
+    "kvm_amd"
     "nvme"
     "nvme_core"
 
@@ -27,5 +26,6 @@ in
   # boot.initrd.availableKernelModules = stage1Modules;
   boot.initrd.kernelModules = stage1Modules;
   boot.extraModprobeConfig = ''
+    options kvm_amd nested=1;
   '';
 }
diff --git a/nix/os/devices/steveej-t14/system.nix b/nix/os/devices/steveej-t14/system.nix
index 52ab96b..1924b1e 100644
--- a/nix/os/devices/steveej-t14/system.nix
+++ b/nix/os/devices/steveej-t14/system.nix
@@ -64,7 +64,9 @@ in {
     "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"
   ];
 
-  services.xserver.videoDrivers = [ "modesetting" ];
+  services.xserver.videoDrivers = lib.mkForce [
+    "amdgpu"
+  ];
   services.xserver.serverFlagsSection = ''
     Option "BlankTime" "0"
     Option "StandbyTime" "0"
@@ -72,8 +74,5 @@ in {
     Option "OffTime" "0"
   '';
 
-  boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest;
-
-
   hardware.ledger.enable = true;
 }