From e377be755fa38b0ea4936b4c55dedfab4200bf21 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 12 Mar 2021 20:12:56 +0100
Subject: ma x.r: cleanup input

---
 makefu/1systems/x/x13/default.nix | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

(limited to 'makefu/1systems/x/x13/default.nix')

diff --git a/makefu/1systems/x/x13/default.nix b/makefu/1systems/x/x13/default.nix
index b0400232e..ac601845a 100644
--- a/makefu/1systems/x/x13/default.nix
+++ b/makefu/1systems/x/x13/default.nix
@@ -8,6 +8,7 @@
     <nixos-hardware/lenovo/thinkpad/l14/amd> # close enough
     # <stockholm/makefu/2configs/hw/tpm.nix>
     <stockholm/makefu/2configs/hw/ssd.nix>
+    <stockholm/makefu/2configs/hw/xmm7360.nix>
   ];
   boot.zfs.requestEncryptionCredentials = true;
   networking.hostId = "f8b8e0a2";
@@ -19,32 +20,15 @@
   services.xserver.videoDrivers = [
     "amdgpu"
   ];
-  hardware.opengl.extraPackages = [ pkgs.amdvlk ];
+  hardware.opengl.extraPackages = [ pkgs.amdvlk pkgs.rocm-opencl-icd ];
   # is required for amd graphics support ( xorg wont boot otherwise )
   boot.kernelPackages = pkgs.linuxPackages_latest;
+
   environment.variables.VK_ICD_FILENAMES =
     "/run/opengl-driver/share/vulkan/icd.d/amd_icd64.json";
 
 
   programs.light.enable = true;
-  services.actkbd = {
-    enable = true;
-    bindings = [
-      { keys = [ 225 ]; events = [ "key" ]; command = "${pkgs.light}/bin/light -A 10"; }
-      { keys = [ 224 ]; events = [ "key" ]; command = "${pkgs.light}/bin/light -U 10"; }
-      { keys = [ 227 ]; events = [ "key" ]; command = builtins.toString (
-        pkgs.writers.writeDash "toggle_lcdshadow" ''
-          proc=/proc/acpi/ibm/lcdshadow
-          status=$(${pkgs.gawk}/bin/awk '/status:/{print $2}' "$proc")
-          if [ "$status" -eq 0 ];then
-            echo 1 > "$proc"
-          else
-            echo 0 > "$proc"
-          fi
-        '');
-      }
-    ];
-  };
 
   users.groups.video = {};
   users.users.makefu.extraGroups = [ "video" ];
-- 
cgit v1.2.3