diff --git a/flake.lock b/flake.lock index 44bd183..3efe372 100644 --- a/flake.lock +++ b/flake.lock @@ -154,11 +154,11 @@ ] }, "locked": { - "lastModified": 1744145203, - "narHash": "sha256-I2oILRiJ6G+BOSjY+0dGrTPe080L3pbKpc+gCV3Nmyk=", + "lastModified": 1744940522, + "narHash": "sha256-TNoetfICvd29DhxRPpmyKItQBDlqSvKcV+wGNkn14jk=", "owner": "nix-community", "repo": "disko", - "rev": "76c0a6dba345490508f36c1aa3c7ba5b6b460989", + "rev": "51d33bbb7f1e74ba5f9d9a77357735149da99081", "type": "github" }, "original": { @@ -445,11 +445,11 @@ ] }, "locked": { - "lastModified": 1744117652, - "narHash": "sha256-t7dFCDl4vIOOUMhEZnJF15aAzkpaup9x4ZRGToDFYWI=", + "lastModified": 1744743431, + "narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=", "owner": "nix-community", "repo": "home-manager", - "rev": "b4e98224ad1336751a2ac7493967a4c9f6d9cb3f", + "rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387", "type": "github" }, "original": { @@ -466,11 +466,11 @@ ] }, "locked": { - "lastModified": 1744663884, - "narHash": "sha256-a6QGaZMDM1miK8VWzAITsEPOdmLk+xTPyJSTjVs3WhI=", + "lastModified": 1745001336, + "narHash": "sha256-R4HuzrgYtOYBNmB3lfRxcieHEBO4uSfgHNz4MzWkZ5M=", "owner": "nix-community", "repo": "home-manager", - "rev": "d5cdf55bd9f19a3debd55b6cb5d38f7831426265", + "rev": "fc09cb7aaadb70d6c4898654ffc872f0d2415df9", "type": "github" }, "original": { @@ -556,11 +556,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1744646317, - "narHash": "sha256-IHiF831GJNv+d+bAJ8Ys5+EaI222/T6QQA9BFcnlqTY=", + "lastModified": 1745005494, + "narHash": "sha256-hiRVFgpUi0aHjRV3yq7Vvvg6xCjJnVmsSIoOhBMeHtY=", "ref": "refs/heads/main", - "rev": "8b7b169043de2a9d95f8505edb8b6576fac586fd", - "revCount": 5997, + "rev": "51afc2c2910d6f7c1f2dee9c90f54729d3c3d940", + "revCount": 6007, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -841,11 +841,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1744932701, + "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", "type": "github" }, "original": { @@ -864,11 +864,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1744669903, - "narHash": "sha256-gtfLmGx/N+BzIck9sGLIfzETxocYjVKo4gmSeH6zfaY=", + "lastModified": 1744874965, + "narHash": "sha256-eOnMgAWsjqOhGRoY9smkKlNQcCz9R89mgiKwLrCIYBE=", "owner": "nix-community", "repo": "nixvim", - "rev": "ee9655637cbf898415e09c399bc504180e246d42", + "rev": "500b56f023e0f095ffee2d4f79e58aa09e6b0719", "type": "github" }, "original": { @@ -886,11 +886,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1744701653, - "narHash": "sha256-t2gPDe1tLXZ9vEkVzGm6kDlJpSjQlw9BwqNdCESvegM=", + "lastModified": 1745009194, + "narHash": "sha256-Y2CsvI0kxTf4F1HAN3uC7EUgrwtMmLcRGcnAr3Q/S1U=", "owner": "nix-community", "repo": "NUR", - "rev": "be95402b424e1dafa2e1e1e8c2781381903ef7b3", + "rev": "1a3564fa217bf2bf662f5fbcd5476318bfb12c07", "type": "github" }, "original": { @@ -1011,11 +1011,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1744668092, - "narHash": "sha256-XDmpI3ywMkypsHKRF2am6BzZ5OjwpQMulAe8L87Ek8U=", + "lastModified": 1744910471, + "narHash": "sha256-HItOUMA2whFnPMJuyN2XHq9TZttgrgOAZcoUXsaD4Js=", "owner": "danth", "repo": "stylix", - "rev": "38aff11a7097f4da6b95d4c4d2c0438f25a08d52", + "rev": "8d5cd725ad591890c0cd804bf68cc842b8afca51", "type": "github" }, "original": { diff --git a/modules/graphical/basics.nix b/modules/graphical/basics.nix index 0f802d0..c6759ff 100644 --- a/modules/graphical/basics.nix +++ b/modules/graphical/basics.nix @@ -32,7 +32,6 @@ in { v4l-utils logseq # notes ani-cli - mangal-patched ]; }; } diff --git a/modules/hardware/amd-gpu.nix b/modules/hardware/amd-gpu.nix index 2a7b49e..4fa31a8 100644 --- a/modules/hardware/amd-gpu.nix +++ b/modules/hardware/amd-gpu.nix @@ -3,6 +3,7 @@ let cfg = config.custom.hardware.amd-gpu; in { options.custom.hardware.amd-gpu = { enable = lib.mkEnableOption "Enables amd gpus"; + rocm.enable = lib.mkEnableOption "Enables rocm"; }; config = @@ -39,7 +40,7 @@ in { enable32Bit = true; package = lib.mkForce mesa-new; #extraPackages = with pkgs; [ mesa-git.amdvlk ]; - #extraPackages = with pkgs; [ rocmPackages.clr.icd ]; + extraPackages = lib.mkIf cfg.rocm.enable (with pkgs; [ rocmPackages.clr rocmPackages.clr.icd ]); }; hardware.amdgpu.initrd.enable = lib.mkDefault true; @@ -49,23 +50,28 @@ in { lact nvtopPackages.amd amdgpu_top + ] ++ lib.optionals cfg.rocm.enable [ + 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 - # ]; - # }; - # in - # [ - # "L+ /opt/rocm - - - - ${rocmEnv}" - # ]; + systemd.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}" + ]; + }; } diff --git a/overlays.nix b/overlays.nix index d981803..c3179d9 100644 --- a/overlays.nix +++ b/overlays.nix @@ -25,7 +25,6 @@ in inputs.hyprland.packages.${prev.stdenv.hostPlatform.system}.hyprland; xdg-desktop-portal-hyprland = inputs.hyprland.packages.${prev.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; - #rocmPackages = prev.rocm-update.rocmPackages; }; # When applied, the unstable nixpkgs set (declared in the flake inputs) will diff --git a/systems/pc/configuration.nix b/systems/pc/configuration.nix index 1a1c87c..476277c 100644 --- a/systems/pc/configuration.nix +++ b/systems/pc/configuration.nix @@ -43,6 +43,7 @@ hardware = { android.enable = true; amd-gpu.enable = true; + amd-gpu.rocm.enable = true; nvidia = { enable = false; clock = {