diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index ca3bf96..38ab6a6 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -59,9 +59,63 @@ in ''; # Kernel boot.initrd.kernelModules = [ "amdgpu" "evdi" ]; - hardware.graphics.extraPackages = with pkgs; [ rocmPackages.clr.icd amdvlk ]; + # hardware.graphics.extraPackages = with pkgs; [ rocmPackages.clr.icd amdvlk ]; # Add Functions home-manager.users.${user.name}.programs.zsh.initExtra = '' source ${zshFunctions} ''; + # Advance Power Management + powerManagement.powertop.enable = true; + powerManagement.enable = true; + services.thermald.enable = true; + services.power-profiles-daemon.enable = false; + services.tlp = { + enable = true; + settings = { + TLP_DEFAULT_MODE = "BAT"; + TLP_PERSISTENT_DEFAULT = 1; + + CPU_BOOST_ON_BAT = 0; + RUNTIME_PM_ON_BAT = "auto"; + PLATFORM_PROFILE_ON_AC = "balanced"; + PLATFORM_PROFILE_ON_BAT = "low-power"; + + CPU_SCALING_GOVERNOR_ON_AC = "performance"; + CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; + + CPU_ENERGY_PERF_POLICY_ON_BAT = "power"; + CPU_ENERGY_PERF_POLICY_ON_AC = "performance"; + + CPU_MIN_PERF_ON_AC = 0; + CPU_MAX_PERF_ON_AC = 100; + CPU_MIN_PERF_ON_BAT = 0; + CPU_MAX_PERF_ON_BAT = 20; + + START_CHARGE_THRESH_BAT0 = 40; # and bellow it starts to charge + STOP_CHARGE_THRESH_BAT0 = 97; # and above it stops charging + }; + }; + # services.auto-cpufreq.enable = true; + # services.auto-cpufreq.settings = { + # battery = { + # governor = "powersave"; + # turbo = "never"; + # }; + # charger = { + # governor = "performance"; + # turbo = "auto"; + # }; + # }; + # Logind + services.logind = { + lidSwitchExternalPower = "suspend-then-hibernate"; + lidSwitch = "suspend-then-hibernate"; + powerKey = "lock"; + extraConfig = '' + HandlePowerKey=suspend-then-hibernate + IdleAction=suspend-then-hibernate + IdleActionSec=2m + ''; + }; + systemd.sleep.extraConfig = "HibernateDelaySec=30m"; } diff --git a/modules/os/docker.nix b/modules/os/docker.nix index 9648d1a..4f282e0 100644 --- a/modules/os/docker.nix +++ b/modules/os/docker.nix @@ -2,6 +2,8 @@ { pkgs, ... }: { virtualisation.docker.enable = true; virtualisation.docker.autoPrune.enable = true; + virtualisation.docker.enableOnBoot = false; + virtualisation.docker.liveRestore = false; environment.systemPackages = with pkgs; [ docker-compose ]; users.users.${user.name}.extraGroups = [ "docker" ]; } diff --git a/modules/os/hardware.nix b/modules/os/hardware.nix index 1a5bc6b..b03cca8 100644 --- a/modules/os/hardware.nix +++ b/modules/os/hardware.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{ ... }: { # Firmware Updater services.fwupd.enable = true; # Enable all license firmware @@ -23,61 +22,6 @@ alsa.support32Bit = true; pulse.enable = true; }; - - # Advance Power Management - powerManagement.powertop.enable = true; - powerManagement.enable = true; - services.thermald.enable = true; - services.power-profiles-daemon.enable = false; - services.tlp = { - enable = true; - settings = { - TLP_DEFAULT_MODE = "BAT"; - TLP_PERSISTENT_DEFAULT = 1; - - CPU_BOOST_ON_BAT = 0; - RUNTIME_PM_ON_BAT = "auto"; - PLATFORM_PROFILE_ON_AC = "balanced"; - PLATFORM_PROFILE_ON_BAT = "low-power"; - - CPU_SCALING_GOVERNOR_ON_AC = "performance"; - CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; - - CPU_ENERGY_PERF_POLICY_ON_BAT = "power"; - CPU_ENERGY_PERF_POLICY_ON_AC = "performance"; - - CPU_MIN_PERF_ON_AC = 0; - CPU_MAX_PERF_ON_AC = 100; - CPU_MIN_PERF_ON_BAT = 0; - CPU_MAX_PERF_ON_BAT = 20; - - START_CHARGE_THRESH_BAT0 = 40; # and bellow it starts to charge - STOP_CHARGE_THRESH_BAT0 = 97; # and above it stops charging - }; - }; - services.auto-cpufreq.enable = true; - services.auto-cpufreq.settings = { - battery = { - governor = "powersave"; - turbo = "never"; - }; - charger = { - governor = "performance"; - turbo = "auto"; - }; - }; - # Logind - services.logind = { - lidSwitchExternalPower = "suspend-then-hibernate"; - lidSwitch = "suspend-then-hibernate"; - powerKey = "lock"; - extraConfig = '' - HandlePowerKey=suspend-then-hibernate - IdleAction=suspend-then-hibernate - IdleActionSec=2m - ''; - }; - systemd.sleep.extraConfig = "HibernateDelaySec=30m"; # Yubikey services.yubikey-agent.enable = true; }