diff --git a/hosts/pennsardin/configuration.nix b/hosts/pennsardin/configuration.nix index 9a9717a..d04905d 100644 --- a/hosts/pennsardin/configuration.nix +++ b/hosts/pennsardin/configuration.nix @@ -1,4 +1,4 @@ -{pkgs, config, ...}: +{pkgs, ...}: let globals = import ../../config/globals.nix; in { @@ -11,14 +11,8 @@ in { networking.hostName = "pennsardin"; boot.kernelPackages = pkgs.linuxPackages_latest; - boot.extraModulePackages = [ config.boot.kernelPackages.nct6687d ]; - boot.kernelModules = [ "nct6683" "k10temp" "i2c-dev" ] ; boot.swraid.enable = true; - environment.systemPackages = with pkgs; [ - lm_sensors - ]; - fileSystems = { "/" = { device = "/dev/disk/by-uuid/b1a1ae71-4277-45d5-a3d2-f49354f263d4"; diff --git a/modules/common/energy.nix b/modules/common/energy.nix index eed44d0..31635c5 100644 --- a/modules/common/energy.nix +++ b/modules/common/energy.nix @@ -1,42 +1,8 @@ -{ config, pkgs, ... }: { +_: { services.logind.settings.Login = { IdleAction = "suspend"; IdleActionSec = "5min"; HandleLidSwitch = "suspend"; HandleLidSwitchDocked = "ignore"; }; - - systemd.services.ssh-suspend-inhibitor = { - description = "Prevent suspend when SSH sessions are active"; - wantedBy = [ "multi-user.target" ]; - - serviceConfig = { - Type = "simple"; - Restart = "always"; - ExecStart = pkgs.writeShellScript "ssh-inhibitor" '' - while true; do - # Vérifie s'il y a des sessions SSH actives - if ${pkgs.procps}/bin/pgrep -x sshd >/dev/null && \ - [ $(${pkgs.procps}/bin/pgrep -P $(${pkgs.procps}/bin/pgrep -x sshd) | wc -l) -gt 0 ]; then - # Il y a des sessions SSH, on crée un inhibitor s'il n'existe pas - if [ ! -f /tmp/ssh-inhibitor.lock ]; then - ${pkgs.systemd}/bin/systemd-inhibit --what=idle:sleep \ - --who="SSH Session" \ - --why="SSH session active" \ - --mode=block \ - sleep infinity & - echo $! > /tmp/ssh-inhibitor.lock - fi - else - # Pas de sessions SSH, on retire l'inhibitor - if [ -f /tmp/ssh-inhibitor.lock ]; then - kill $(cat /tmp/ssh-inhibitor.lock) 2>/dev/null || true - rm /tmp/ssh-inhibitor.lock - fi - fi - sleep 10 - done - ''; - }; - }; } diff --git a/modules/hardware/gpu-amd.nix b/modules/hardware/gpu-amd.nix index 981f849..caa4f31 100644 --- a/modules/hardware/gpu-amd.nix +++ b/modules/hardware/gpu-amd.nix @@ -44,4 +44,6 @@ "radeon.cik_support=0" ]; + # Si un module sonde "k10temp" gêne : + boot.blacklistedKernelModules = ["k10temp"]; }