Commit 76325b68d08b

Vincent Demeester <vincent@sbr.pm>
2018-11-23 18:32:46
hardware: remove some thinkpad duplication
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
main
1 parent 390584c
Changed files (4)
hardware
lenovo-p50.nix
thinkpad-t460s.nix
thinkpad-x220.nix
thinkpad.nix
hardware/lenovo-p50.nix
@@ -1,9 +1,7 @@
 { config, pkgs, ...}:
 
 {
-  imports = [
-    ./thinkpad.nix
-  ];
+  imports = [ ./thinkpad.nix ];
   
   hardware.bluetooth.enable = true;
   hardware.bluetooth.powerOnBoot = true;
@@ -12,14 +10,6 @@
   hardware.nvidia.optimus_prime.intelBusId = "PCI:0:2:0";
   
   services = {
-    acpid = {
-      lidEventCommands = ''
-if grep -q closed /proc/acpi/button/lid/LID/state; then
-  date >> /tmp/i3lock.log
-  DISPLAY=":0.0" XAUTHORITY=/home/fadenb/.Xauthority ${pkgs.i3lock}/bin/i3lock &>> /tmp/i3lock.log
-fi
-'';
-    };
     tlp = {
       extraConfig = ''
 # CPU optimizations
hardware/thinkpad-t460s.nix
@@ -1,19 +1,8 @@
 { config, pkgs, ... }:
 
 {
-  imports =
-    [
-    ./thinkpad.nix
-  ];
+  imports = [ ./thinkpad.nix ];
   services = {
-    acpid = {
-      lidEventCommands = ''
-if grep -q closed /proc/acpi/button/lid/LID/state; then
-  date >> /tmp/i3lock.log
-  DISPLAY=":0.0" XAUTHORITY=/home/fadenb/.Xauthority ${pkgs.i3lock}/bin/i3lock &>> /tmp/i3lock.log
-fi
-'';
-    };
     tlp = {
       extraConfig = ''
 # CPU optimizations
hardware/thinkpad-x220.nix
@@ -1,18 +1,8 @@
 { config, pkgs, ... }:
 
 {
-  imports = [
-    ./thinkpad.nix
-  ];
+  imports = [ ./thinkpad.nix ];
   services = {
-    acpid = {
-      lidEventCommands = ''
-if grep -q closed /proc/acpi/button/lid/LID/state; then
-  date >> /tmp/i3lock.log
-  DISPLAY=":0.0" XAUTHORITY=/home/fadenb/.Xauthority ${pkgs.i3lock}/bin/i3lock &>> /tmp/i3lock.log
-fi
-'';
-    };
     tlp = {
       extraConfig = ''
 # CPU optimizations
hardware/thinkpad.nix
@@ -25,6 +25,12 @@
   services = {
     acpid = {
       enable = true;
+      lidEventCommands = ''
+if grep -q closed /proc/acpi/button/lid/LID/state; then
+  date >> /tmp/i3lock.log
+  DISPLAY=":0.0" XAUTHORITY=/home/fadenb/.Xauthority ${pkgs.i3lock}/bin/i3lock &>> /tmp/i3lock.log
+fi
+      '';
     };
     tlp = {
       enable = true;