From 1daa6f0232078704eb93c547b7772fabaaec9612 Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Fri, 23 May 2025 14:52:49 -0500 Subject: [PATCH] cleanup --- flake.nix | 4 ++++ hosts/desktop/home.nix | 3 +++ hosts/nas/boot.nix | 1 - hosts/nas/home.nix | 3 +++ share/amd/default.nix | 5 ++++- 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 4873b3f..1626281 100755 --- a/flake.nix +++ b/flake.nix @@ -377,6 +377,8 @@ } desktop-nixos-hardware.nixosModules.common-cpu-amd + desktop-nixos-hardware.nixosModules.common-cpu-amd-pstate + desktop-nixos-hardware.nixosModules.common-cpu-amd-zenpower desktop-nixos-hardware.nixosModules.common-gpu-amd desktop-nixos-hardware.nixosModules.common-hidpi desktop-nixos-hardware.nixosModules.common-pc @@ -436,6 +438,8 @@ nas-nixos-hardware.nixosModules.common-pc nas-nixos-hardware.nixosModules.common-cpu-amd + nas-nixos-hardware.nixosModules.common-cpu-amd-pstate + nas-nixos-hardware.nixosModules.common-cpu-amd-zenpower nas-nixos-hardware.nixosModules.common-hidpi ]; }; diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index f469559..28524d0 100755 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -124,6 +124,9 @@ in userName = "mjallen18"; userEmail = "matt.l.jallen@gmail.com"; aliases = gitAliases; + extraConfig = { + credential.helper = "gnome-keyring"; + }; }; steam-rom-manager = { diff --git a/hosts/nas/boot.nix b/hosts/nas/boot.nix index 10e6f9d..084aae3 100755 --- a/hosts/nas/boot.nix +++ b/hosts/nas/boot.nix @@ -39,7 +39,6 @@ in kernelParams = [ "nohibernate" - "amd_pstate=active" ]; consoleLogLevel = 3; diff --git a/hosts/nas/home.nix b/hosts/nas/home.nix index 247ecfb..6f82b59 100755 --- a/hosts/nas/home.nix +++ b/hosts/nas/home.nix @@ -100,6 +100,9 @@ in userName = "mjallen18"; userEmail = "matt.l.jallen@gmail.com"; aliases = gitAliases; + extraConfig = { + credential.helper = "libsecret"; + }; }; }; } diff --git a/share/amd/default.nix b/share/amd/default.nix index d3825f6..14437c5 100755 --- a/share/amd/default.nix +++ b/share/amd/default.nix @@ -12,7 +12,10 @@ in imports = [ ./options.nix ]; config = lib.mkIf cfg.enable { - boot.kernelParams = [ (if cfg.enable then "amdgpu.ppfeaturemask=0xffffffff" else null) ]; + boot = { + kernelModules = [ "nct6775" ]; + kernelParams = [ (if cfg.enable then "amdgpu.ppfeaturemask=0xffffffff" else null) ]; + }; # Configure programs programs.corectrl = {