tristan/nix
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Fix build & improve tdp & tcltemp mgmt for fw16

Browse source
This commit is contained in:
Tristan D. 2025-03-09 00:01:36 +01:00
parent 3a2182859f
commit 36b060ecdc
Signed by: tristan
SSH key fingerprint: SHA256:9oFM1J63hYWJjCnLG6C0fxBS15rwNcWwdQNMOHYKJ/4
6 changed files with 57 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ext/doom/init.el
View file

@ -31,7 +31,7 @@
:ui :ui
;;deft ; notational velocity for Emacs ;;deft ; notational velocity for Emacs
doom ; what makes DOOM look the way it does doom ; what makes DOOM look the way it does
doom-dashboard ; a nifty splash screen for Emacs ;; doom-dashboard ; a nifty splash screen for Emacs
doom-quit ; DOOM quit-message prompts when you quit Emacs doom-quit ; DOOM quit-message prompts when you quit Emacs
;; (emoji +unicode) ; 🙂 ;; (emoji +unicode) ; 🙂
hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW

33
flake.lock generated
View file

@ -277,9 +277,6 @@
}, },
"emacs-overlay": { "emacs-overlay": {
"inputs": { "inputs": {
"flake-utils": [
"flake-utils"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
@ -288,17 +285,17 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730626539, "lastModified": 1741462424,
"narHash": "sha256-gAivT/gAHhzdRpB+4hBYhLBF51KIj+hvo9J9tbJ6VDU=", "narHash": "sha256-nZVbxj4JRfjaCwdvzHpmo8LfSX+roUuAs7A8o5cJ5hU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "7cd35bfbe2fbb2906bc85803eab0bdc499b6f253", "rev": "6e4d92e5c26dc81241d4c800531ad1f8ee68f213",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "7cd35bfbe2fbb2906bc85803eab0bdc499b6f253", "rev": "6e4d92e5c26dc81241d4c800531ad1f8ee68f213",
"type": "github" "type": "github"
} }
}, },
@ -673,15 +670,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741393072, "lastModified": 1739920383,
"narHash": "sha256-+Su28oU1FBvptj1AO0geJP+BcIJghSVxaNFagvW5K2M=", "narHash": "sha256-n5NYJvnQbIW3XbBohbQK4YfJ38GgyDWDu/XTw0FsuHs=",
"owner": "nix-community", "owner": "NovaViper",
"repo": "home-manager", "repo": "home-manager",
"rev": "d2c014e1c73195d1958abec0c5ca6112b07b79da", "rev": "fc592ef0edd0681c3f91a1083cef53ec630f1d5f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "NovaViper",
"ref": "kde6-qt",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -1489,15 +1487,16 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1741392477, "lastModified": 1739742581,
"narHash": "sha256-6ySHuduGhlZBv1uxEOlOeHWDEkKuLQ/O63DI+ZRfAmg=", "narHash": "sha256-0Ze86fzS6dzw/i0+egACKR7EGe9eoOriIHwKpTDQvTI=",
"owner": "danth", "owner": "brckd",
"repo": "stylix", "repo": "stylix",
"rev": "6eea250b10386be0fc23496d1039d76b3147680e", "rev": "e3fe2c662862c2fbf09bfd9fc0556d0e4225298b",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "danth", "owner": "brckd",
"ref": "treewide/add-overlays-option",
"repo": "stylix", "repo": "stylix",
"type": "github" "type": "github"
} }

22
flake.nix
View file

@ -75,12 +75,12 @@
inputs.home-manager.follows = "home-manager"; inputs.home-manager.follows = "home-manager";
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; # url = "github:nix-community/home-manager";
# url = "github:NovaViper/home-manager/kde6-qt"; # TODO Back to default after https://github.com/nix-community/home-manager/pull/6493 url = "github:NovaViper/home-manager/kde6-qt"; # TODO Back to default after https://github.com/nix-community/home-manager/pull/6493
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
emacs-overlay = { emacs-overlay = {
url = "github:nix-community/emacs-overlay/7cd35bfbe2fbb2906bc85803eab0bdc499b6f253"; url = "github:nix-community/emacs-overlay/6e4d92e5c26dc81241d4c800531ad1f8ee68f213";
inputs.flake-utils.follows = "flake-utils"; inputs.flake-utils.follows = "flake-utils";
inputs.nixpkgs-stable.follows = "nixpkgs-stable"; inputs.nixpkgs-stable.follows = "nixpkgs-stable";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -128,8 +128,8 @@
inputs.flake-compat.follows = "flake-compat"; inputs.flake-compat.follows = "flake-compat";
}; };
stylix = { stylix = {
url = "github:danth/stylix"; # TODO Switch to this once https://github.com/danth/stylix/pull/866 is merged # url = "github:danth/stylix"; # TODO Switch to this once https://github.com/danth/stylix/pull/866 is merged
# url = "github:brckd/stylix/treewide/add-overlays-option"; url = "github:brckd/stylix/treewide/add-overlays-option";
inputs.flake-compat.follows = "flake-compat"; inputs.flake-compat.follows = "flake-compat";
inputs.flake-utils.follows = "flake-utils"; inputs.flake-utils.follows = "flake-utils";
inputs.home-manager.follows = "home-manager"; inputs.home-manager.follows = "home-manager";
@ -196,7 +196,17 @@
# "olm-3.2.16" # "olm-3.2.16"
]; ];
}; };
pkgs = import nixpkgs { pkgs' = (import nixpkgs { inherit config system overlays; }).applyPatches {
name = "nixpkgs-patched";
src = inputs.nixpkgs;
patches = [
(builtins.fetchurl {
url = "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/384669.patch";
sha256 = "sha256:0lnkxl83hlc4hsqv38ja8k4bwrylg1mkqrrmhj2cdqk3dk401ypb";
})
];
};
pkgs = import pkgs' {
inherit config system overlays; inherit config system overlays;
}; };
lib = pkgs.lib; lib = pkgs.lib;

6
home-mods/shell/default.nix
View file

@ -10,7 +10,7 @@ let
doomemacsSrc = builtins.fetchGit { doomemacsSrc = builtins.fetchGit {
url = "https://github.com/doomemacs/doomemacs"; url = "https://github.com/doomemacs/doomemacs";
ref = "master"; ref = "master";
rev = "56ce6cc284e8f4dd0cb0704dde6694a1b8e500ed"; rev = "8846d151814ebbf7fb90d9d5dd16cd737257408e";
}; };
neofetchThemesSrc = builtins.fetchGit { neofetchThemesSrc = builtins.fetchGit {
url = "https://github.com/Chick2D/neofetch-themes"; url = "https://github.com/Chick2D/neofetch-themes";
@ -21,8 +21,8 @@ let
with epkgs; [ with epkgs; [
vterm vterm
treesit-grammars.with-all-grammars treesit-grammars.with-all-grammars
inputs.nix-emacs-extra.packages."${system}".doom-dashboard # inputs.nix-emacs-extra.packages."${system}".doom-dashboard
inputs.nix-emacs-extra.packages."${system}".ultra-scroll # inputs.nix-emacs-extra.packages."${system}".ultra-scroll
]); ]);
in in
{ {

22
os-mods/ryzenapu/default.nix
View file

@ -17,9 +17,23 @@
${ryzenadj}/bin/ryzenadj --stapm-limit="$value" --fast-limit="$value" --slow-limit="$value" --tctl-temp=85 ${ryzenadj}/bin/ryzenadj --stapm-limit="$value" --fast-limit="$value" --slow-limit="$value" --tctl-temp=85
'') '')
]; ];
systemd = let
systemd = { tcl = "85";
coall = "1048561"; # 1048561 = 0x100000 - 15(mV) $ math "0x100000-15" # slight undervolt
defaults = "--tctl-temp=${tcl} --set-coall=${coall}";
in {
services = { services = {
ryzenadj = {
enable = false;
description = "RyzenAdj Autoset";
serviceConfig = {
Type = "oneshot";
User = "root";
ExecStart = "${pkgs.ryzenadj}/bin/ryzenadj ${defaults}";
};
wantedBy = [ "multi-user.target" ];
};
desktop-power-maximum-tdp = { desktop-power-maximum-tdp = {
description = "Change TDP to maximum TDP when on AC power"; description = "Change TDP to maximum TDP when on AC power";
wantedBy = [ "ac.target" ]; wantedBy = [ "ac.target" ];
@ -33,7 +47,7 @@
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";
preStart = "sleep 2"; preStart = "sleep 2";
script = '' script = ''
ryzenadj --stapm-limit=45000 --fast-limit=45000 --slow-limit=45000 --tctl-temp=85 ryzenadj --stapm-limit=50000 --slow-limit=54000 --fast-limit=55000 ${defaults}
''; '';
}; };
@ -48,7 +62,7 @@
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";
preStart = "sleep 2"; preStart = "sleep 2";
script = '' script = ''
ryzenadj --stapm-limit=10000 --fast-limit=10000 --slow-limit=10000 --tctl-temp=85 ryzenadj --stapm-limit=10000 --slow-limit=15000 --fast-limit=25000 ${defaults}
''; '';
}; };

16
systems/nixos-fw16/default.nix
View file

@ -21,7 +21,7 @@
../../os-mods/desktop/printing.nix ../../os-mods/desktop/printing.nix
../../os-mods/netdata/client.nix ../../os-mods/netdata/client.nix
../../os-mods/network ../../os-mods/network
# ../../os-mods/ryzenapu ../../os-mods/ryzenapu
../../os-mods/virt ../../os-mods/virt
../../users ../../users
./disks.nix ./disks.nix
@ -134,8 +134,8 @@
# kernelPackages = pkgs.pkgsAMD64Microarchs.znver4.linuxPackages_cachyos; # kernelPackages = pkgs.pkgsAMD64Microarchs.znver4.linuxPackages_cachyos;
# 6.14 rc wohooo # 6.14 rc wohooo
kernelPackages = pkgs.linuxPackages_cachyos-rc; # kernelPackages = pkgs.linuxPackages_cachyos-rc;
# kernelPackages = pkgs.pkgsAMD64Microarchs.znver2.linuxPackages_cachyos-rc; kernelPackages = pkgs.pkgsAMD64Microarchs.znver2.linuxPackages_cachyos-rc;
# kernelPackages = pkgs.pkgsAMD64Microarchs.znver2.linuxPackages_cachyos; # kernelPackages = pkgs.pkgsAMD64Microarchs.znver2.linuxPackages_cachyos;
# kernelPackages = pkgs.linuxPackages_cachyos; # kernelPackages = pkgs.linuxPackages_cachyos;
@ -237,16 +237,6 @@
systemd = { systemd = {
services = { services = {
ryzenadj = {
enable = false;
description = "RyzenAdj Autoset";
serviceConfig = {
Type = "oneshot";
User = "root";
ExecStart = "${pkgs.ryzenadj}/bin/ryzenadj -f90 --set-coall=1048566"; # 1048566 = 0x100000 - 10(mV)
};
wantedBy = [ "multi-user.target" ];
};
# Do not manage HID devices with powertop to prevent annoying keyboard/mouse sleeps # Do not manage HID devices with powertop to prevent annoying keyboard/mouse sleeps
# powertop.postStart = '' # powertop.postStart = ''