notgne2/nixfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clean up and make battery long live

Browse source
This commit is contained in:
notgne2 2025-10-21 23:23:59 -07:00
parent 08709cf1a9
commit d0a2b164fa
No known key found for this signature in database
7 changed files with 106 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

30
modules/nix-ssh-agent.nix
View file

@ -1,30 +0,0 @@
{
config,
lib,
pkgs,
...
}: let
cfg = config.nix.ssh-agent;
in {
options.nix.ssh-agent = {
sock = lib.mkOption {
description = "SSH agent socket for Nix to use";
default = "/run/user/1000/ssh-agent";
type = lib.types.str;
};
};
config = lib.mkIf (cfg.sock != null) {
# systemd.services.ssh-agent-nix-proxy = {
# wantedBy = [ "nix-daemon.service" ];
# partOf = [ "nix-daemon.service" ];
# serviceConfig = {
# ExecStart = "${pkgs.socat}/bin/socat UNIX-LISTEN:/run/nix-ssh-agent,mode=770,group=nixbld,user=root,reuseaddr,fork UNIX-CONNECT:${cfg.sock}";
# Restart = "always";
# };
# };
# systemd.services.nix-daemon.environment.SSH_AUTH_SOCK = "/run/nix-ssh-agent";
systemd.services.nix-daemon.environment.SSH_AUTH_SOCK = cfg.sock;
};
}

56
modules/workstation.nix
View file

@ -64,58 +64,14 @@ in {
services.ezpw.enable = lib.mkDefault true;
security.pam.services = {
swaylock.text = ''
auth include login
'';
};
services.thermald.enable = lib.mkDefault true;
# Don't kill the battery
services.upower = {
enable = lib.mkDefault cfg.battery;
percentageLow = lib.mkDefault 15;
percentageCritical = lib.mkDefault 10;
percentageAction = lib.mkDefault 5;
criticalPowerAction = lib.mkDefault "Hibernate";
};
services.upower.enable = lib.mkDefault cfg.battery;
# Make battery usage sane
services.tlp = {
enable = lib.mkDefault cfg.battery;
settings = {
PCIE_ASPM_ON_BAT = lib.mkDefault "powersupersave";
PCIE_ASPM_ON_AC = lib.mkDefault "default";
PLATFORM_PROFILE_ON_BAT = lib.mkDefault "low-power";
PLATFORM_PROFILE_ON_AC = lib.mkDefault "performance";
CPU_SCALING_GOVERNOR_ON_BAT = lib.mkOverride 900 "powersave";
CPU_SCALING_GOVERNOR_ON_AC = lib.mkOverride 900 "performance";
CPU_ENERGY_PERF_POLICY_ON_BAT = lib.mkDefault "power";
CPU_ENERGY_PERF_POLICY_ON_AC = lib.mkDefault "performance";
CPU_BOOST_ON_BAT = lib.mkDefault 0;
CPU_BOOST_ON_AC = lib.mkDefault 1;
CPU_HWP_DYN_BOOST_ON_BAT = lib.mkDefault 0;
CPU_HWP_DYN_BOOST_ON_AC = lib.mkDefault 1;
SCHED_POWERSAVE_ON_BAT = lib.mkDefault 1;
SCHED_POWERSAVE_ON_AC = lib.mkDefault 0;
CPU_MAX_PERF_ON_BAT = lib.mkDefault 30;
CPU_MAX_PERF_ON_AC = lib.mkDefault 100;
CPU_SCALING_MIN_FREQ_ON_BAT = lib.mkDefault 0;
CPU_SCALING_MIN_FREQ_ON_AC = lib.mkDefault 0;
CPU_SCALING_MAX_FREQ_ON_BAT = lib.mkDefault 9999999;
CPU_SCALING_MAX_FREQ_ON_AC = lib.mkDefault 9999999;
};
};
# Make battery usage and performance sane
services.power-profiles-daemon.enable = lib.mkDefault true;
services.system76-scheduler.enable = lib.mkDefault true;
# Video support
hardware.graphics = {
@ -229,10 +185,6 @@ in {
mouse.accelProfile = lib.mkDefault "flat";
touchpad.accelProfile = lib.mkDefault "flat";
};
services.xserver = {
dpi = lib.mkDefault 96;
xkb.layout = lib.mkDefault "us";
};
networking.networkmanager.wifi.macAddress = lib.mkDefault "random";
networking.networkmanager.wifi.scanRandMacAddress = lib.mkDefault true;