diff --git a/home/fabric/default.nix b/home/fabric/default.nix index 7223a92..236a4bf 100644 --- a/home/fabric/default.nix +++ b/home/fabric/default.nix @@ -67,7 +67,7 @@ ripgrep fd lsd - pulseaudio + brightnessctl nerd-fonts.fira-mono diff --git a/hosts/common/global/default.nix b/hosts/common/global/default.nix index 7fd2c65..0920637 100644 --- a/hosts/common/global/default.nix +++ b/hosts/common/global/default.nix @@ -27,6 +27,7 @@ zsh home-manager findutils + pulseaudio ]; # Enable the OpenSSH daemon @@ -53,9 +54,10 @@ system.stateVersion = "25.05"; security.rtkit.enable = true; + services.pulseaudio.enable = false; services.pipewire = { enable = true; alsa.enable = true; - pulse.enable = true; # <-- This is the crucial part + pulse.enable = true; }; } diff --git a/hosts/common/optional/auto-cpufreq.nix b/hosts/common/optional/auto-cpufreq.nix new file mode 100644 index 0000000..32d4695 --- /dev/null +++ b/hosts/common/optional/auto-cpufreq.nix @@ -0,0 +1,32 @@ +{...}: { + services.tlp = { + enable = true; + settings = { + 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; + + # Optional helps save long term battery health + START_CHARGE_THRESH_BAT0 = 40; # 40 and bellow it starts to charge + STOP_CHARGE_THRESH_BAT0 = 80; # 80 and above it stops charging + }; + }; + # services.auto-cpufreq.enable = true; + # services.auto-cpufreq.settings = { + # battery = { + # governor = "powersave"; + # turbo = "never"; + # }; + # charger = { + # governor = "performance"; + # turbo = "auto"; + # }; + # }; +} diff --git a/hosts/solaris/default.nix b/hosts/solaris/default.nix index 5358444..b842a86 100644 --- a/hosts/solaris/default.nix +++ b/hosts/solaris/default.nix @@ -15,6 +15,7 @@ ../common/optional/bluetooth.nix ../common/optional/kmonad.nix + ../common/optional/auto-cpufreq.nix ]; # Bootloader @@ -33,7 +34,7 @@ users.users.fabric = { isNormalUser = true; description = "fabric"; - extraGroups = ["networkmanager" "wheel" "docker"]; + extraGroups = ["networkmanager" "wheel" "video"]; shell = pkgs.zsh; }; @@ -66,5 +67,8 @@ foot usbutils ntfs3g + powertop ]; + + powerManagement.powertop.enable = true; } diff --git a/hosts/solaris/hardware-configuration.nix b/hosts/solaris/hardware-configuration.nix index c237bfc..a39645b 100644 --- a/hosts/solaris/hardware-configuration.nix +++ b/hosts/solaris/hardware-configuration.nix @@ -1,32 +1,36 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["acpi_cpufreq"]; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/disk/by-uuid/cd452eaf-7765-4bc2-b5dd-a846c47701e8"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/cd452eaf-7765-4bc2-b5dd-a846c47701e8"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/6026-C63E"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/6026-C63E"; + fsType = "vfat"; + options = ["fmask=0077" "dmask=0077"]; + }; - swapDevices = - [ { device = "/dev/disk/by-uuid/1cc175bd-0071-4d76-a8a6-ae483ca56aac"; } - ]; + swapDevices = [ + {device = "/dev/disk/by-uuid/1cc175bd-0071-4d76-a8a6-ae483ca56aac";} + ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's