summaryrefslogtreecommitdiffstats
path: root/makefu/2configs/hw
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2021-03-17 15:42:13 +0100
committerlassulus <lassulus@lassul.us>2021-03-17 15:42:13 +0100
commit3d1472a7cac3ab2c5f9efd06a501368308681999 (patch)
tree950fbe49dfd060923756dd517c41f27f646857de /makefu/2configs/hw
parentf659c1879f6e0a0e9228205edd794aaab467aa0b (diff)
parent2044ad632b68ce173463287a9f437aae699bda83 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/2configs/hw')
-rw-r--r--makefu/2configs/hw/tp-x230.nix8
-rw-r--r--makefu/2configs/hw/xmm7360.nix11
2 files changed, 18 insertions, 1 deletions
diff --git a/makefu/2configs/hw/tp-x230.nix b/makefu/2configs/hw/tp-x230.nix
index 37d1affb7..69fe7adce 100644
--- a/makefu/2configs/hw/tp-x230.nix
+++ b/makefu/2configs/hw/tp-x230.nix
@@ -1,6 +1,5 @@
{ config, lib, pkgs, ... }:
-with import <stockholm/lib>;
{
imports = [ ./tp-x2x0.nix <nixos-hardware/lenovo/thinkpad/x230> ];
@@ -11,6 +10,13 @@ with import <stockholm/lib>;
# possible i915 powersave options:
# options i915 enable_rc6=1 enable_fbc=1 semaphores=1
+ boot.extraModprobeConfig = ''
+ options thinkpad_acpi fan_control=1
+ options i915 enable_rc6=1 enable_fbc=1 semaphores=1
+ '';
+
+ boot.initrd.availableKernelModules = [ "thinkpad_acpi" ];
+
services.xserver.displayManager.sessionCommands =''
xinput set-int-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation" 8 1
xinput set-int-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Button" 8 2
diff --git a/makefu/2configs/hw/xmm7360.nix b/makefu/2configs/hw/xmm7360.nix
new file mode 100644
index 000000000..951dcaa0b
--- /dev/null
+++ b/makefu/2configs/hw/xmm7360.nix
@@ -0,0 +1,11 @@
+{ pkgs, config, ... }:
+let
+ pkg = (pkgs.callPackage ../../5pkgs/xmm7360 { kernel = config.boot.kernelPackages.kernel; });
+in
+{
+ boot.extraModulePackages = [
+ pkg
+ ];
+ boot.initrd.availableKernelModules = [ "xmm7360" ];
+ users.users.makefu.packages = [ pkg ];
+}