diff options
| author | lassulus <lassulus@lassul.us> | 2022-12-08 13:11:27 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2022-12-08 13:11:27 +0100 |
| commit | d7341bbff6b0b866aa5d8bc9b248e8468fba5952 (patch) | |
| tree | 5833484e2ebf219ed06e66b40cdc3c626e4db73c /tv | |
| parent | ac32440c0b41a3c7dc67ab7dc8d3306ab7fae091 (diff) | |
| parent | f8fdd76e7195d4a4f0117f7e64032075bb01a98e (diff) | |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'tv')
| -rw-r--r-- | tv/2configs/hw/x220.nix | 3 | ||||
| -rw-r--r-- | tv/2configs/imgur.nix | 4 | ||||
| -rw-r--r-- | tv/5pkgs/simple/imagescan-plugin-networkscan.nix | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/tv/2configs/hw/x220.nix b/tv/2configs/hw/x220.nix index 25e2effb..c3ec7b40 100644 --- a/tv/2configs/hw/x220.nix +++ b/tv/2configs/hw/x220.nix @@ -61,6 +61,9 @@ in emulateWheel = true; }; + # Conflicts with TLP, but gets enabled by DEs. + services.power-profiles-daemon.enable = false; + services.tlp.enable = true; services.tlp.settings = { START_CHARGE_THRESH_BAT0 = 80; diff --git a/tv/2configs/imgur.nix b/tv/2configs/imgur.nix index ba84fd2d..1df67f93 100644 --- a/tv/2configs/imgur.nix +++ b/tv/2configs/imgur.nix @@ -18,8 +18,6 @@ with import <stockholm/lib>; krebs.htgen.imgur = { port = 7771; - script = /* sh */ '' - (. ${pkgs.htgen-imgur}/bin/htgen-imgur) - ''; + scriptFile = "${pkgs.htgen-imgur}/bin/htgen-imgur"; }; } diff --git a/tv/5pkgs/simple/imagescan-plugin-networkscan.nix b/tv/5pkgs/simple/imagescan-plugin-networkscan.nix index c3f2deac..4f9b84b2 100644 --- a/tv/5pkgs/simple/imagescan-plugin-networkscan.nix +++ b/tv/5pkgs/simple/imagescan-plugin-networkscan.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { preFixup = '' patchelf --set-interpreter \ - ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \ + ${pkgs.pkgsi686Linux.glibc}/lib/ld-linux-x86-64.so.2 \ $out/lib/utsushi/networkscan # libstdc++.so.6 |