From 7a5e17e8d8d0376527edaf7d8ca7c5d8fb310793 Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Mon, 15 Jan 2024 08:11:48 +0100 Subject: [PATCH 1/2] feat: move tlp config to laptop configs --- configuration.nix | 2 -- machines/apache/hardware-configuration.nix | 2 ++ machines/xps/hardware-configuration.nix | 2 ++ machines/yoga/hardware-configuration.nix | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/configuration.nix b/configuration.nix index ef49462..974ec05 100644 --- a/configuration.nix +++ b/configuration.nix @@ -26,8 +26,6 @@ powertop.enable = true; }; - services.tlp.enable = true; - services.acpid = { enable = true; logEvents = true; diff --git a/machines/apache/hardware-configuration.nix b/machines/apache/hardware-configuration.nix index 300113e..bc1d014 100644 --- a/machines/apache/hardware-configuration.nix +++ b/machines/apache/hardware-configuration.nix @@ -37,4 +37,6 @@ networking.useDHCP = lib.mkDefault true; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + + services.tlp.enable = true; } diff --git a/machines/xps/hardware-configuration.nix b/machines/xps/hardware-configuration.nix index bd4ae76..39171d9 100644 --- a/machines/xps/hardware-configuration.nix +++ b/machines/xps/hardware-configuration.nix @@ -63,4 +63,6 @@ # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + + services.tlp.enable = true; } diff --git a/machines/yoga/hardware-configuration.nix b/machines/yoga/hardware-configuration.nix index be4c371..d0970ed 100644 --- a/machines/yoga/hardware-configuration.nix +++ b/machines/yoga/hardware-configuration.nix @@ -49,4 +49,6 @@ hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.sensor.iio.enable = true; + + services.tlp.enable = true; } From 907d306fc8164d923c1dae8bdb5ebce073ff0121 Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Mon, 15 Jan 2024 08:12:22 +0100 Subject: [PATCH 2/2] feat: override console font on p330 --- configuration.nix | 4 ++-- machines/p330/hardware-configuration.nix | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configuration.nix b/configuration.nix index 974ec05..ab0dc7b 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: { nixpkgs.config.allowUnfree = true; @@ -60,7 +60,7 @@ i18n.defaultLocale = "en_US.UTF-8"; console = { - font = "ter-u24n"; + font = lib.mkDefault "ter-u24n"; keyMap = "de-latin1-nodeadkeys"; packages = with pkgs; [ terminus_font ]; earlySetup = true; diff --git a/machines/p330/hardware-configuration.nix b/machines/p330/hardware-configuration.nix index 602988a..120d4b7 100644 --- a/machines/p330/hardware-configuration.nix +++ b/machines/p330/hardware-configuration.nix @@ -44,4 +44,6 @@ [{ device = "/dev/disk/by-uuid/b90199d6-05e8-4994-bf9d-7b07f10d583e"; }]; networking.useDHCP = lib.mkDefault true; + + console.font = "ter-u32n"; }