From 6a82f294335cbc0991f7a95355adfb9f7b7e6f43 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 5 Dec 2022 16:54:54 +0100
Subject: tv: use nix.settings

---
 tv/2configs/hw/x220.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tv/2configs/hw')

diff --git a/tv/2configs/hw/x220.nix b/tv/2configs/hw/x220.nix
index 8c68cdef0..25e2effbd 100644
--- a/tv/2configs/hw/x220.nix
+++ b/tv/2configs/hw/x220.nix
@@ -28,8 +28,8 @@ in
     }
 
     {
-      nix.buildCores = 2;
-      nix.maxJobs = 2;
+      nix.settings.cores = 2;
+      nix.settings.max-jobs = 2;
     }
     (if lib.versionAtLeast (lib.versions.majorMinor lib.version) "21.11" then {
       nix.daemonCPUSchedPolicy = "batch";
-- 
cgit v1.2.3


From 4939592fa67b4e07842d96f0beeee2f8eb4baff9 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 7 Dec 2022 20:31:34 +0100
Subject: tv x220: disable power-profiles-daemon

---
 tv/2configs/hw/x220.nix | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'tv/2configs/hw')

diff --git a/tv/2configs/hw/x220.nix b/tv/2configs/hw/x220.nix
index 25e2effbd..c3ec7b40e 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;
-- 
cgit v1.2.3


From 6d64096cd99db27357bf2d038bdfdfc2d3a3aeae Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 9 Dec 2022 01:31:56 +0100
Subject: tv: normalize lib imports

---
 tv/2configs/hw/AO753.nix  | 7 ++-----
 tv/2configs/hw/lib        | 1 +
 tv/2configs/hw/w110er.nix | 5 ++---
 tv/2configs/hw/x220.nix   | 6 ++----
 4 files changed, 7 insertions(+), 12 deletions(-)
 create mode 120000 tv/2configs/hw/lib

(limited to 'tv/2configs/hw')

diff --git a/tv/2configs/hw/AO753.nix b/tv/2configs/hw/AO753.nix
index dd6fcfe67..b998fcf7c 100644
--- a/tv/2configs/hw/AO753.nix
+++ b/tv/2configs/hw/AO753.nix
@@ -1,8 +1,5 @@
-{ config, lib, pkgs, ... }:
-
-with import <stockholm/lib>;
-
-{
+with import ./lib;
+{ config, pkgs, ... }: {
   imports = [
     ../smartd.nix
 
diff --git a/tv/2configs/hw/lib b/tv/2configs/hw/lib
new file mode 120000
index 000000000..dc598c56d
--- /dev/null
+++ b/tv/2configs/hw/lib
@@ -0,0 +1 @@
+../lib
\ No newline at end of file
diff --git a/tv/2configs/hw/w110er.nix b/tv/2configs/hw/w110er.nix
index 09dd9a49d..bf749a98a 100644
--- a/tv/2configs/hw/w110er.nix
+++ b/tv/2configs/hw/w110er.nix
@@ -1,6 +1,5 @@
-{ pkgs, ... }: let
-  lib = import <stockholm/lib>;
-in {
+with import ./lib;
+{ pkgs, ... }: {
   imports = [
     ../smartd.nix
     {
diff --git a/tv/2configs/hw/x220.nix b/tv/2configs/hw/x220.nix
index c3ec7b40e..ee3c7dc04 100644
--- a/tv/2configs/hw/x220.nix
+++ b/tv/2configs/hw/x220.nix
@@ -1,7 +1,5 @@
-{ config, pkgs, ... }: let
-  lib = import <stockholm/lib>;
-in
-{
+with import ./lib;
+{ config, pkgs, ... }: {
   imports = [
     ../smartd.nix
     {
-- 
cgit v1.2.3