From 6fc6744fe7b3bacaab51b1d0f057bbcd6139e940 Mon Sep 17 00:00:00 2001 From: Tristan Druyen Date: Sat, 22 Mar 2025 23:36:14 +0100 Subject: [PATCH] Update flake inputs & zen --- flake.lock | 78 +++++++++++++++++----------------- os-mods/amdgpu/default.nix | 14 +++--- pkgs/zen-browser.json | 4 +- systems/nixos-fw16/default.nix | 2 +- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/flake.lock b/flake.lock index d52e10c..7fb82c6 100644 --- a/flake.lock +++ b/flake.lock @@ -58,11 +58,11 @@ ] }, "locked": { - "lastModified": 1741545559, - "narHash": "sha256-K28WBQoi1XSFfuakma+TJveihNbhpYMZUGYwvjAmic8=", + "lastModified": 1742656338, + "narHash": "sha256-Vkg5dyXKwoAfEVlKPxbCbdTCF9sXmTySZBSL28Kcdmo=", "owner": "oddlama", "repo": "agenix-rekey", - "rev": "86f26bd7401b8c1e1bde2b9479e88d3b532488d8", + "rev": "b677dbe0d675c68a19dedbc771aff22de76b11ea", "type": "github" }, "original": { @@ -151,11 +151,11 @@ ] }, "locked": { - "lastModified": 1742347728, - "narHash": "sha256-wpAF+eNdPN21hwVirBXSsRDeWtTflkhsZL5zhGy6uB8=", + "lastModified": 1742647741, + "narHash": "sha256-hli9R2OONaRpyV5teQk+g73oBNQXFbKAZTHVY+AhKDI=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "f8371934a154aad05f0f8f3f6ddaccb00f1b91e8", + "rev": "f44e30fb15f34b57b741124448e959b2cae38eb8", "type": "github" }, "original": { @@ -334,11 +334,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1742279664, - "narHash": "sha256-K/gD8271/eRjwks4EX1fLHCjb4UzdUqDCGdwNh4TwIw=", + "lastModified": 1742452566, + "narHash": "sha256-sVuLDQ2UIWfXUBbctzrZrXM2X05YjX08K7XHMztt36E=", "owner": "nix-community", "repo": "fenix", - "rev": "193dcb4e6edb3ba927f4d88b8b1fe65b9e5368c3", + "rev": "7d9ba794daf5e8cc7ee728859bc688d8e26d5f06", "type": "github" }, "original": { @@ -708,11 +708,11 @@ ] }, "locked": { - "lastModified": 1742278596, - "narHash": "sha256-ZShdL237Hz+Sog0mzfsCui+kyj+Xd2ka91Dilxlz9j4=", + "lastModified": 1742465245, + "narHash": "sha256-gpjtkoeq5Ye9J8GoR+rWg3NL4bbEtcLvvF4nN6MtxdU=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "fd69a59cfab06fe8ac0695377e10573e91b6a3ff", + "rev": "a95606cae5c9e1f5b84debe7865ef171d4deb287", "type": "github" }, "original": { @@ -1003,11 +1003,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1742376361, - "narHash": "sha256-VFMgJkp/COvkt5dnkZB4D2szVdmF6DGm5ZdVvTUy61c=", + "lastModified": 1742631601, + "narHash": "sha256-yJ3OOAmsGAxSl0bTmKUp3+cEYtSS+V6hUPK2rYhIPr8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "daaae13dff0ecc692509a1332ff9003d9952d7a9", + "rev": "380ed15bcd6440606c6856db44a99140d422b46f", "type": "github" }, "original": { @@ -1023,11 +1023,11 @@ "nixos-unstable": "nixos-unstable" }, "locked": { - "lastModified": 1742207159, - "narHash": "sha256-YslINLA3Bl+etkSoMgstTaawaCZjZKciYB8yf39LJWM=", + "lastModified": 1742432671, + "narHash": "sha256-6M0lxz78i79n0UUm6GP/r7zMFXWr0V7gZhpnmtLSlJQ=", "owner": "nix-community", "repo": "nixos-images", - "rev": "1443843b4cb0a19f65ac925efb814ba865bdf278", + "rev": "55f23642b75d501387691a22a7e86fbc22d06372", "type": "github" }, "original": { @@ -1038,10 +1038,10 @@ }, "nixos-stable": { "locked": { - "lastModified": 1741600792, - "narHash": "sha256-yfDy6chHcM7pXpMF4wycuuV+ILSTG486Z/vLx/Bdi6Y=", + "lastModified": 1742268799, + "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=", "ref": "nixos-24.11", - "rev": "ebe2788eafd539477f83775ef93c3c7e244421d3", + "rev": "da044451c6a70518db5b730fe277b70f494188f1", "shallow": true, "type": "git", "url": "https://github.com/NixOS/nixpkgs" @@ -1055,10 +1055,10 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1741708242, - "narHash": "sha256-cNRqdQD4sZpN7JLqxVOze4+WsWTmv2DGH0wNCOVwrWc=", + "lastModified": 1742272065, + "narHash": "sha256-ud8vcSzJsZ/CK+r8/v0lyf4yUntVmDq6Z0A41ODfWbE=", "ref": "nixpkgs-unstable", - "rev": "b62d2a95c72fb068aecd374a7262b37ed92df82b", + "rev": "3549532663732bfd89993204d40543e9edaec4f2", "shallow": true, "type": "git", "url": "https://github.com/NixOS/nixpkgs" @@ -1132,11 +1132,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1742268799, - "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=", + "lastModified": 1742512142, + "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "da044451c6a70518db5b730fe277b70f494188f1", + "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", "type": "github" }, "original": { @@ -1180,11 +1180,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1742288794, - "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", + "lastModified": 1742422364, + "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", + "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", "type": "github" }, "original": { @@ -1223,11 +1223,11 @@ ] }, "locked": { - "lastModified": 1742375758, - "narHash": "sha256-2DyqzYbSiU5/sLiBSxhFXzmhWw7xH5d9gZXp93VhFLE=", + "lastModified": 1742679909, + "narHash": "sha256-t00hcdDSGhMKd6hhQo0zOkQ5mTOPlim4HKX3l3l0b9M=", "owner": "nix-community", "repo": "NUR", - "rev": "1ad28216d9a988e1e786d2d818db7cab20ca59ae", + "rev": "635036ec7ec1fce48d678acfbc84b83c4d44ec41", "type": "github" }, "original": { @@ -1402,11 +1402,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1742249107, - "narHash": "sha256-3jVOcCZgXBvQ2HsjgHXmZow9/3d1K4oRwVyvhYfnvyg=", + "lastModified": 1742296961, + "narHash": "sha256-gCpvEQOrugHWLimD1wTFOJHagnSEP6VYBDspq96Idu0=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "31e412c290f6ff6de4548e94e187477f072b179e", + "rev": "15d87419f1a123d8f888d608129c3ce3ff8f13d4", "type": "github" }, "original": { @@ -1677,11 +1677,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1742145767, - "narHash": "sha256-2a8K1CyR2BEWq6g/eKDtk7oLr+fJZR0H4UdkwhrpoFk=", + "lastModified": 1742565713, + "narHash": "sha256-vcny+Smh1MS1OMliN4GjLhFQcJ80nIu/hAR60C6SKU8=", "owner": "winapps-org", "repo": "winapps", - "rev": "dd744822a337a8fd1966a135895c43dd173ed6c6", + "rev": "1f9f25e9384d88ff5d58adf6c4ab8ef5e93dc8d9", "type": "github" }, "original": { diff --git a/os-mods/amdgpu/default.nix b/os-mods/amdgpu/default.nix index 7503cf3..79c44a3 100644 --- a/os-mods/amdgpu/default.nix +++ b/os-mods/amdgpu/default.nix @@ -5,7 +5,7 @@ , ... }: { programs.corectrl = { - enable = true; + enable = false; gpuOverclock.enable = true; }; @@ -18,9 +18,9 @@ ]; chaotic.mesa-git = { - enable = true; + enable = false; extraPackages = with pkgs; [ - mesa_git.opencl + mesa_git.openclmesa libva-vdpau-driver obs-studio-plugins.obs-vaapi # TODO check if obs is enabled gst_all_1.gstreamer @@ -39,7 +39,7 @@ graphics = { extraPackages = with pkgs; [ - # rocmPackages.clr.icd + rocmPackages.clr.icd libva-vdpau-driver obs-studio-plugins.obs-vaapi # TODO check if obs is enabled gst_all_1.gstreamer @@ -52,7 +52,7 @@ }; systemd.services.lactd = { - enable = false; + enable = true; description = "Radeon GPU monitor"; after = [ "syslog.target" "systemd-modules-load.service" ]; @@ -70,9 +70,9 @@ # environment.variables.AMD_VULKAN_ICD = "RADV"; environment.systemPackages = with pkgs; [ ## MONITORING TOOLS ## - # nvtopPackages.amd # for AMD GPUs # broken ? + nvtopPackages.amd # for AMD GPUs # broken ? - # lact + lact vulkan-tools libva-utils glxinfo # TODO right place here or in desktop ? diff --git a/pkgs/zen-browser.json b/pkgs/zen-browser.json index 8251b80..b64647f 100644 --- a/pkgs/zen-browser.json +++ b/pkgs/zen-browser.json @@ -1,4 +1,4 @@ { - "version": "1.9.1b", - "hash": "sha256-OpdUeFzFAWi1ur2nKt4WSWJqj/J/4iigSmxMBCOGg+w=" + "version": "1.10.1b", + "hash": "sha256-1NoDIdzeADVLOhtesR0QZefhAdRBSNWg4++MjqdkfIs=" } diff --git a/systems/nixos-fw16/default.nix b/systems/nixos-fw16/default.nix index 8d97cbf..3682e08 100644 --- a/systems/nixos-fw16/default.nix +++ b/systems/nixos-fw16/default.nix @@ -143,7 +143,7 @@ kernelPatches = [ ]; kernelParams = [ # "systemd.unit=emergency.target" - # "amdgpu.ppfeaturemask=0xfffd7fff" # gpu overclockfoo # TODO Readd if crashes continue 20/02/2025 + "amdgpu.ppfeaturemask=0xfffd7fff" # gpu overclockfoo for LACT /fanctrl "systemd.setenv=SYSTEMD_SULOGIN_FORCE=1" # "rescue" "pcie_aspm=force" # TODO Check hibernate without