From 3ce31a7e12c445c0d7937f45567a4de90dd93670 Mon Sep 17 00:00:00 2001
From: Alexander Bantyev <balsoft@balsoft.ru>
Date: Sun, 1 Mar 2020 20:37:16 +0300
Subject: [PATCH] Update modules/hardware.nix modules/power.nix

---
 modules/hardware.nix | 13 +++----------
 modules/power.nix    |  8 --------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/modules/hardware.nix b/modules/hardware.nix
index fa6b210..5e120e6 100644
--- a/modules/hardware.nix
+++ b/modules/hardware.nix
@@ -76,16 +76,12 @@ with deviceSpecific; {
       ANALOGIO: 0
     '';
   };
+  boot.kernelModules = [ "ec_sys" ];
   systemd.services.thinkpad_leds = {
     enable = config.device == "T490s-Laptop";
     description = "Set up thinkpad leds";
     wantedBy = [ "multi-user.target" ];
-    script = ''
-      modprobe -r ec_sys
-      modprobe ec_sys write_support=1
-      echo -n -e "\x0e" | dd of="/sys/kernel/debug/ec/ec0/io" bs=1 seek=12 count=1 conv=notrunc 2> /dev/null
-      modprobe -r ec_sys
-    '';
+    script = ''echo -n -e "\x0e" | dd of="/sys/kernel/debug/ec/ec0/io" bs=1 seek=12 count=1 conv=notrunc 2> /dev/null'';
     serviceConfig.Type = "oneshot";
   };
 
@@ -109,10 +105,7 @@ with deviceSpecific; {
       "axp288_adc"
     ]; # Disable battery driver as it hangs this piece of shit
     extraModulePackages = [ pkgs.linuxPackages.v4l2loopback ];
-    extraModprobeConfig = if (device == "ASUS-Laptop") then
-      "options iwlwifi swcrypto=1 power_save=0 power_level=5 11n_disable=8 bt_coex_active=1"
-    else
-      ""; # Attempt to fix broken wireless
+    extraModprobeConfig = "options ec_sys write_support=1";
     kernel.sysctl."vm.swappiness" = 0;
     kernelPackages = pkgs.linuxPackages;
     kernel.sysctl."kernel/sysrq" = 1;
diff --git a/modules/power.nix b/modules/power.nix
index ba43661..d5141d9 100644
--- a/modules/power.nix
+++ b/modules/power.nix
@@ -44,12 +44,4 @@ with deviceSpecific; {
       echo "900" > /sys/class/backlight/*/brightness
         '';
   };
-  systemd.services.leds_setup = {
-    enable = (device == "ASUS-Laptop");
-    description = "Set up leds triggers";
-    wantedBy = ["multi-user.target"];
-    script = ''
-      echo "phy0rx" > /sys/class/leds/asus-wireless\:\:airplane/trigger
-    '';
-  };
 }