From 586a53e9e988d71961b471a84626dda6785bae08 Mon Sep 17 00:00:00 2001 From: Kopatz <7265381+Kropatz@users.noreply.github.com> Date: Mon, 26 May 2025 18:12:55 +0200 Subject: [PATCH] update flake --- flake.lock | 88 ++++++++++++++++++------------------ modules/hardware/amd-gpu.nix | 67 +++++++++------------------ overlays.nix | 4 -- 3 files changed, 65 insertions(+), 94 deletions(-) diff --git a/flake.lock b/flake.lock index ebd427e..56f3914 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1745357003, - "narHash": "sha256-jYwzQkv1r7HN/4qrAuKp+NR4YYNp2xDrOX5O9YVqkWo=", + "lastModified": 1747864449, + "narHash": "sha256-PIjVAWghZhr3L0EFM2UObhX84UQxIACbON0IC0zzSKA=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "a19cf76ee1a15c1c12083fa372747ce46387289f", + "rev": "389372c5f4dc1ac0e7645ed29a35fd6d71672ef5", "type": "github" }, "original": { @@ -154,11 +154,11 @@ ] }, "locked": { - "lastModified": 1747742835, - "narHash": "sha256-kYL4GCwwznsypvsnA20oyvW8zB/Dvn6K5G/tgMjVMT4=", + "lastModified": 1748225455, + "narHash": "sha256-AzlJCKaM4wbEyEpV3I/PUq5mHnib2ryEy32c+qfj6xk=", "owner": "nix-community", "repo": "disko", - "rev": "df522e787fdffc4f32ed3e1fca9ed0968a384d62", + "rev": "a894f2811e1ee8d10c50560551e50d6ab3c392ba", "type": "github" }, "original": { @@ -423,11 +423,11 @@ ] }, "locked": { - "lastModified": 1747556831, - "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=", + "lastModified": 1748226808, + "narHash": "sha256-GaBRgxjWO1bAQa8P2+FDxG4ANBVhjnSjBms096qQdxo=", "owner": "nix-community", "repo": "home-manager", - "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33", + "rev": "83665c39fa688bd6a1f7c43cf7997a70f6a109f9", "type": "github" }, "original": { @@ -444,11 +444,11 @@ ] }, "locked": { - "lastModified": 1747793476, - "narHash": "sha256-2qAOSixSrbb9l6MI+SI4zGineOzDcc2dgOOFK9Dx+IY=", + "lastModified": 1748227609, + "narHash": "sha256-SaSdslyo6UGDpPUlmrPA4dWOEuxCy2ihRN9K6BnqYsA=", "owner": "nix-community", "repo": "home-manager", - "rev": "2468b2d35512d093aeb04972a1d8c20a0735793f", + "rev": "d23d20f55d49d8818ac1f1b2783671e8a6725022", "type": "github" }, "original": { @@ -534,11 +534,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1747610850, - "narHash": "sha256-eGOtDlq3h+r/X/j4oSNo6cmQlt67TVolgUJMnGKTRt4=", + "lastModified": 1748271215, + "narHash": "sha256-tenIJO9WaE9+aHxAt/14WkBu5i59cr4+vvzbBPHAOv0=", "ref": "refs/heads/main", - "rev": "eb3b38d40baca5c05ddbc1507b3d3f02a0ccb164", - "revCount": 6127, + "rev": "292a7456af9465a57a7fe3ee36d113ae661a9ff3", + "revCount": 6138, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -658,11 +658,11 @@ ] }, "locked": { - "lastModified": 1746655412, - "narHash": "sha256-kVQ0bHVtX6baYxRWWIh4u3LNJZb9Zcm2xBeDPOGz5BY=", + "lastModified": 1747484975, + "narHash": "sha256-+LAQ81HBwG0lwshHlWe0kfWg4KcChIPpnwtnwqmnoEU=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "557241780c179cf7ef224df392f8e67dab6cef83", + "rev": "163c83b3db48a17c113729c220a60b94596c9291", "type": "github" }, "original": { @@ -708,11 +708,11 @@ ] }, "locked": { - "lastModified": 1739870480, - "narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=", + "lastModified": 1747584298, + "narHash": "sha256-PH9qZqWLHvSBQiUnA0NzAyQA3tu2no2z8kz0ZeHWj4w=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b", + "rev": "e511882b9c2e1d7a75d45d8fddd2160daeafcbc3", "type": "github" }, "original": { @@ -751,11 +751,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1747723695, - "narHash": "sha256-lSXzv33yv1O9r9Ai1MtYFDX3OKhWsZMn/5FFb4Rni/k=", + "lastModified": 1747900541, + "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "6ac6ec6fcb410e15a60ef5ec94b8a2b35b5dd282", + "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06", "type": "github" }, "original": { @@ -767,11 +767,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747825515, - "narHash": "sha256-BWpMQymVI73QoKZdcVCxUCCK3GNvr/xa2Dc4DM1o2BE=", + "lastModified": 1748162331, + "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cd2812de55cf87df88a9e09bf3be1ce63d50c1a6", + "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334", "type": "github" }, "original": { @@ -783,11 +783,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1747744144, - "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", + "lastModified": 1748026106, + "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", + "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", "type": "github" }, "original": { @@ -807,11 +807,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1747743401, - "narHash": "sha256-AXk6mf9ySe44faNUGhD1mZud/kB7X+Nipzo2YxHet4s=", + "lastModified": 1748261770, + "narHash": "sha256-X+QUzjjZ64lZzzd1dkxIGoLHkJvmDqoEHhx81Mmx0rw=", "owner": "nix-community", "repo": "nixvim", - "rev": "47dba84e0d068a2b8c07faa0ec737ea98a226537", + "rev": "91ee94cde3d5fdde68550ac861fd0644ff47109f", "type": "github" }, "original": { @@ -829,11 +829,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1747817738, - "narHash": "sha256-TzFKX0BJQVLQHJovGIUvqYDOQAXMomjMmfWWr9dAWLo=", + "lastModified": 1748270593, + "narHash": "sha256-zNWrRkz+RCNrdUvjWDfIjVA4KEJL3y19YzVEoLsrwV0=", "owner": "nix-community", "repo": "NUR", - "rev": "a8222a0f4e9ce81457d053bc047180de5f41b4d2", + "rev": "ab78785ce60222e9e15e4af8d76f4873bd39d445", "type": "github" }, "original": { @@ -921,11 +921,11 @@ ] }, "locked": { - "lastModified": 1748203497, - "narHash": "sha256-p70TDN6Z1XtRM+TpdJyg9X8at85hyJGMVwFBMDcf5LA=", + "lastModified": 1748259954, + "narHash": "sha256-Z3lY/RRgqJU6fqMzuB5DZDN5uepahBFST0KI4lDngXE=", "ref": "refs/heads/master", - "rev": "f672b897a7f10d47ac833d4a616ecb1cdb1aa11d", - "revCount": 544, + "rev": "ee31e5d226a9ad909c71a72b09864a82dd27b7b8", + "revCount": 553, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, @@ -977,11 +977,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1747818590, - "narHash": "sha256-O8hKI4Eh7GWWVVxuoZGmDrRmLBX+fE3lI53t6IGx6pg=", + "lastModified": 1748269774, + "narHash": "sha256-jIvkWbhsrBSV492OuKJwBLAdearm0jmvXoYSMRNseI0=", "owner": "danth", "repo": "stylix", - "rev": "42b1521816580633a27c5367c57695cc99a0f0c1", + "rev": "aa70426f8f4373da2f454de3e27b565241960599", "type": "github" }, "original": { diff --git a/modules/hardware/amd-gpu.nix b/modules/hardware/amd-gpu.nix index 4fa31a8..fc1ad84 100644 --- a/modules/hardware/amd-gpu.nix +++ b/modules/hardware/amd-gpu.nix @@ -7,30 +7,6 @@ in { }; config = - let - mesa-new = pkgs.mesa.overrideAttrs (old: { - src = pkgs.fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "mesa"; - repo = "mesa"; - rev = "93547d45ceb0a59f429f6029b339c044f8aaabaa"; - hash = "sha256-u5Lksclv0+cMfO02Ilp6v/7UCoTdm5veIvf1uejWlgQ="; - }; - patches = [ - ./opencl.patch - ]; - }); - - #mesa-new = pkgs.mesa-git.mesa.overrideAttrs (oldAttrs: { - # src = pkgs.fetchFromGitLab { - # domain = "gitlab.freedesktop.org"; - # owner = "hakzsam"; - # repo = "mesa"; - # rev = "9238ae542f15e4566430a540817e15a8ec079a59"; - # hash = "sha256-c/iV/V7m3GuatEuybaetHVIPm66/a6lC1wvV/GGtvnQ="; - # }; - #}); - in lib.mkIf cfg.enable { boot.kernelParams = [ "amdgpu.ppfeaturemask=0xfff7ffff" "split_lock_detect=off" ]; @@ -38,8 +14,6 @@ in { hardware.graphics = { enable = true; enable32Bit = true; - package = lib.mkForce mesa-new; - #extraPackages = with pkgs; [ mesa-git.amdvlk ]; extraPackages = lib.mkIf cfg.rocm.enable (with pkgs; [ rocmPackages.clr rocmPackages.clr.icd ]); }; @@ -51,27 +25,28 @@ in { nvtopPackages.amd amdgpu_top ] ++ lib.optionals cfg.rocm.enable [ - clinfo - rocmPackages.rocminfo + clinfo + rocmPackages.rocminfo ]; - systemd.packages = with pkgs; [ lact ]; - systemd.services.lactd.wantedBy = [ "multi-user.target" ]; - #rocm - systemd.tmpfiles.rules = - let - rocmEnv = pkgs.symlinkJoin { - name = "rocm-combined"; - paths = with pkgs.rocmPackages; [ - rocblas - hipblas - clr + systemd = { + packages = with pkgs; [ lact ]; + services.lactd.wantedBy = [ "multi-user.target" ]; + #rocm + tmpfiles.rules = + let + rocmEnv = pkgs.symlinkJoin { + name = "rocm-combined"; + paths = with pkgs.rocmPackages; [ + rocblas + hipblas + clr + ]; + }; + in + lib.mkIf cfg.rocm.enable + [ + "L+ /opt/rocm - - - - ${rocmEnv}" ]; - }; - in - lib.mkIf cfg.rocm.enable - [ - "L+ /opt/rocm - - - - ${rocmEnv}" - ]; - + }; }; } diff --git a/overlays.nix b/overlays.nix index bee62fe..697f65a 100644 --- a/overlays.nix +++ b/overlays.nix @@ -4,10 +4,6 @@ let addPatches = pkg: patches: pkg.overrideAttrs (oldAttrs: { patches = (oldAttrs.patches or [ ]) ++ patches; }); - mesa-git = import inputs.nixpkgs-mesa-git { - system = "x86_64-linux"; - config.allowUnfree = true; - }; in { # This one brings our custom packages from the 'pkgs' directory