diff --git a/home/utils/python.nix b/home/utils/python.nix index e351e5c..9ead6a9 100644 --- a/home/utils/python.nix +++ b/home/utils/python.nix @@ -6,6 +6,7 @@ let zlib zstd stdenv.cc.cc + stdenv.cc.cc.lib curl openssl attr diff --git a/hosts/Aloria/default.nix b/hosts/Aloria/default.nix index 1b4dca7..6f1385b 100644 --- a/hosts/Aloria/default.nix +++ b/hosts/Aloria/default.nix @@ -22,6 +22,31 @@ in { }; services.throttled.enable = true; services.thinkfan.enable = true; + services.thinkfan.settings = { + sensors = [ + # Search for 'coretemp' anywhere in /sys/class/hwmon + { hwmon = "/sys/class/hwmon"; name = "coretemp"; indices = [ 1 ]; } + + # Search for 'acpitz' + { hwmon = "/sys/class/hwmon"; name = "acpitz"; indices = [ 1 ]; } + + # Search for 'nvme' + { hwmon = "/sys/class/hwmon"; name = "nvme"; indices = [ 1 ]; } + ]; + + fans = [ + { tpacpi = "/proc/acpi/ibm/fan"; } + ]; + + levels = [ + [ 0 0 45 ] + [ 1 42 55 ] + [ 2 50 60 ] + [ 3 56 68 ] + [ 5 64 78 ] + [ 7 76 95 ] + ]; + }; programs.steam = { enable = true; diff --git a/hosts/Aloria/hardware-configuration.nix b/hosts/Aloria/hardware-configuration.nix index bf6f076..62b0246 100644 --- a/hosts/Aloria/hardware-configuration.nix +++ b/hosts/Aloria/hardware-configuration.nix @@ -11,7 +11,10 @@ boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + boot.extraModulePackages = [ config.boot.kernelPackages.tp_smapi ]; + boot.extraModprobeConfig = '' + options thinkpad_acpi fan_control=1 + ''; fileSystems."/" = { device = "rpool/root"; diff --git a/hosts/Common/default.nix b/hosts/Common/default.nix index c22d0c9..e2b6171 100644 --- a/hosts/Common/default.nix +++ b/hosts/Common/default.nix @@ -7,7 +7,63 @@ security.rtkit.enable = true; programs.zsh.enable = true; networking.firewall.enable = false; - programs.nix-ld.enable = true; + programs.nix-ld = { + enable = true; + libraries = with pkgs; [ + # Toolchain / C++ runtime + stdenv.cc.cc # libc, libgcc, libstdc++ + stdenv.cc.cc.lib # sometimes needed explicitly + + # Compression / archive + zlib + zstd + xz + bzip2 + + # Crypto / TLS / networking + openssl + curl + libssh + + # Core system libs + attr + acl + util-linux + libsodium + systemd # libudev, libsystemd + libxml2 + expat + + # Graphics / X11 / desktop + xorg.libX11 + xorg.libXext + xorg.libXfixes + xorg.libXdamage + xorg.libXcomposite + xorg.libXrandr + xorg.libxcb + libdrm + mesa + libxkbcommon + + # Audio / desktop integration + alsa-lib + dbus + cups + + # GLib / GTK stack (lots of GUI apps, Electron, etc.) + glib + gdk-pixbuf + pango + cairo + atk + gtk3 + + # NSS/NSPR (Firefox, Electron, many apps) + nspr + nss + ]; + }; boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.memtest86.enable = true;