From b6b98a126e0e1aae48302afba3244b85b956ffd4 Mon Sep 17 00:00:00 2001 From: wo2wz <189177184+wo2wz@users.noreply.github.com> Date: Sat, 20 Dec 2025 23:20:26 +0000 Subject: [PATCH] system/laptop: split logind and auto-cpufreq config --- hosts/Swordsmachine/default.nix | 4 ++-- .../nixos/system/{laptop.nix => laptop/auto-cpufreq.nix} | 8 +------- modules/nixos/system/laptop/default.nix | 8 ++++++++ modules/nixos/system/laptop/logind.nix | 9 +++++++++ 4 files changed, 20 insertions(+), 9 deletions(-) rename modules/nixos/system/{laptop.nix => laptop/auto-cpufreq.nix} (79%) mode change 100644 => 100755 create mode 100644 modules/nixos/system/laptop/default.nix create mode 100644 modules/nixos/system/laptop/logind.nix diff --git a/hosts/Swordsmachine/default.nix b/hosts/Swordsmachine/default.nix index 0664ea4..bbe46ba 100755 --- a/hosts/Swordsmachine/default.nix +++ b/hosts/Swordsmachine/default.nix @@ -19,12 +19,12 @@ ../../modules/nixos/services/tailscale ../../modules/nixos/services/tailscale/exit-node/client.nix + ../../modules/nixos/system/laptop ../../modules/nixos/system/colors.nix ../../modules/nixos/system/console-colors.nix ../../modules/nixos/system/desktop.nix ../../modules/nixos/system/fonts.nix ../../modules/nixos/system/home-manager.nix - ../../modules/nixos/system/laptop.nix ../../modules/nixos/system/printing.nix ../../modules/nixos/system/scx.nix ../../modules/nixos/system/swap.nix @@ -106,4 +106,4 @@ }; system.stateVersion = "24.11"; -} \ No newline at end of file +} diff --git a/modules/nixos/system/laptop.nix b/modules/nixos/system/laptop/auto-cpufreq.nix old mode 100644 new mode 100755 similarity index 79% rename from modules/nixos/system/laptop.nix rename to modules/nixos/system/laptop/auto-cpufreq.nix index 23babe7..c5e1ade --- a/modules/nixos/system/laptop.nix +++ b/modules/nixos/system/laptop/auto-cpufreq.nix @@ -1,12 +1,6 @@ { config, ... }: { - services.logind.settings.Login = { - HandleLidSwitch = "suspend"; - HandleLidSwitchExternalPower = "lock"; - HandleLidSwitchDocked = "ignore"; - }; - services = { tlp.enable = false; power-profiles-daemon.enable = false; @@ -33,4 +27,4 @@ }; }; }; -} \ No newline at end of file +} diff --git a/modules/nixos/system/laptop/default.nix b/modules/nixos/system/laptop/default.nix new file mode 100644 index 0000000..a7da824 --- /dev/null +++ b/modules/nixos/system/laptop/default.nix @@ -0,0 +1,8 @@ +{ config, ... }: + +{ + imports = [ + ./auto-cpufreq.nix + ./logind.nix + ]; +} diff --git a/modules/nixos/system/laptop/logind.nix b/modules/nixos/system/laptop/logind.nix new file mode 100644 index 0000000..f82bdd8 --- /dev/null +++ b/modules/nixos/system/laptop/logind.nix @@ -0,0 +1,9 @@ +{ config, ... }: + +{ + services.logind.settings.Login = { + HandleLidSwitch = "suspend"; + HandleLidSwitchExternalPower = "lock"; + HandleLidSwitchDocked = "ignore"; + }; +}